diff options
author | Bob Badour <bbadour@google.com> | 2021-02-05 22:10:20 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-05 22:10:20 +0000 |
commit | 2c7ccca634c03e8f9fe93cc102912682a1362164 (patch) | |
tree | 9df88c82f3605fdcacc6fc47b566743dd10dac74 | |
parent | 99e332d008585d705b925ebc5b64aef078499233 (diff) | |
parent | 2ebf52a7866f80089c008abfe4e9d0d72e2b1f87 (diff) | |
download | easel-2c7ccca634c03e8f9fe93cc102912682a1362164.tar.gz |
[LSC] Add LOCAL_LICENSE_KINDS to hardware/google/easel am: 791c056dc2 am: 2ebf52a786
Original change: https://android-review.googlesource.com/c/platform/hardware/google/easel/+/1574718
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I85bdf56eb901b7405db4fa17f1ddce2eb5dbd795
-rw-r--r-- | Android.bp | 29 | ||||
-rw-r--r-- | amber/camera/Android.bp | 8 | ||||
-rw-r--r-- | amber/camera/libhdrplusclient/Android.mk | 2 |
3 files changed, 39 insertions, 0 deletions
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 |