diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2021-02-06 02:07:37 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2021-02-06 02:07:37 +0000 |
commit | 9514a43bbba1892219e15f63705ab784b3d6fbbb (patch) | |
tree | 9df88c82f3605fdcacc6fc47b566743dd10dac74 | |
parent | a697fa29894f2dc1bde8d2357dfbe307ec93ef7c (diff) | |
parent | 857b61ecbb94ba0d41c888f60196c75ace210ce1 (diff) | |
download | easel-9514a43bbba1892219e15f63705ab784b3d6fbbb.tar.gz |
Snap for 7128142 from 857b61ecbb94ba0d41c888f60196c75ace210ce1 to sc-v2-releaseandroid-vts-12.1_r9android-vts-12.1_r8android-vts-12.1_r7android-vts-12.1_r6android-vts-12.1_r5android-vts-12.1_r4android-vts-12.1_r3android-vts-12.1_r2android-vts-12.1_r10android-vts-12.1_r1android-platform-12.1.0_r9android-platform-12.1.0_r8android-platform-12.1.0_r7android-platform-12.1.0_r6android-platform-12.1.0_r5android-platform-12.1.0_r4android-platform-12.1.0_r3android-platform-12.1.0_r28android-platform-12.1.0_r27android-platform-12.1.0_r26android-platform-12.1.0_r25android-platform-12.1.0_r24android-platform-12.1.0_r23android-platform-12.1.0_r22android-platform-12.1.0_r21android-platform-12.1.0_r20android-platform-12.1.0_r2android-platform-12.1.0_r19android-platform-12.1.0_r18android-platform-12.1.0_r17android-platform-12.1.0_r16android-platform-12.1.0_r15android-platform-12.1.0_r14android-platform-12.1.0_r13android-platform-12.1.0_r12android-platform-12.1.0_r11android-platform-12.1.0_r10android-platform-12.1.0_r1android-cts-12.1_r9android-cts-12.1_r8android-cts-12.1_r7android-cts-12.1_r6android-cts-12.1_r5android-cts-12.1_r4android-cts-12.1_r3android-cts-12.1_r2android-cts-12.1_r10android-cts-12.1_r1android-12.1.0_r6android-12.1.0_r5android-12.1.0_r4android-12.1.0_r3android-12.1.0_r27android-12.1.0_r2android-12.1.0_r1android12L-tests-releaseandroid12L-s1-releaseandroid12L-releaseandroid12L-platform-releaseandroid12L-gsi
Change-Id: I2d0335727faa2272c275aae2248987e689903ee8
-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 |