From 791c056dc2c2f53b110753a902cb1a26599c7126 Mon Sep 17 00:00:00 2001 From: Bob Badour Date: Wed, 3 Feb 2021 17:31:46 -0800 Subject: [LSC] Add LOCAL_LICENSE_KINDS to hardware/google/easel Added SPDX-license-identifier-Apache-2.0 to: Android.bp amber/camera/Android.bp amber/camera/libhdrplusclient/Android.mk Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I16a5e68b3d379fed343a8cc20e67c3ac4aabb48b --- Android.bp | 29 +++++++++++++++++++++++++++++ amber/camera/Android.bp | 8 ++++++++ amber/camera/libhdrplusclient/Android.mk | 2 ++ 3 files changed, 39 insertions(+) create mode 100644 Android.bp diff --git a/Android.bp b/Android.bp new file mode 100644 index 0000000..474ca05 --- /dev/null +++ b/Android.bp @@ -0,0 +1,29 @@ +// +// Copyright (C) 2021 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package { + default_applicable_licenses: ["hardware_google_easel_license"], +} + +// Added automatically by a large-scale-change +// http://go/android-license-faq +license { + name: "hardware_google_easel_license", + visibility: [":__subpackages__"], + license_kinds: [ + "SPDX-license-identifier-Apache-2.0", + ], + // large-scale-change unable to identify any license_text files +} diff --git a/amber/camera/Android.bp b/amber/camera/Android.bp index d0d2dad..c72e035 100644 --- a/amber/camera/Android.bp +++ b/amber/camera/Android.bp @@ -14,6 +14,14 @@ * limitations under the License. */ +package { + // http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // the below license kinds from "hardware_google_easel_license": + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["hardware_google_easel_license"], +} + cc_library_headers { name: "libhdrplusclient_headers", proprietary: true, diff --git a/amber/camera/libhdrplusclient/Android.mk b/amber/camera/libhdrplusclient/Android.mk index e898824..5e89389 100644 --- a/amber/camera/libhdrplusclient/Android.mk +++ b/amber/camera/libhdrplusclient/Android.mk @@ -54,6 +54,8 @@ LOCAL_EXPORT_C_INCLUDE_DIRS += \ hardware/google/easel/amber/camera/include LOCAL_MODULE:= libhdrplusclient +LOCAL_LICENSE_KINDS:= SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS:= notice LOCAL_PROPRIETARY_MODULE := true LOCAL_MODULE_OWNER := google -- cgit v1.2.3