diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-01-27 02:08:25 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-01-27 02:08:25 +0000 |
commit | 58cdd2b5af7c3299176b62c55e290f49d2284389 (patch) | |
tree | d89c870f8282050a184590314faef3c890b61394 | |
parent | 2f9269790effb8f0831999246977edad3398e663 (diff) | |
parent | 6079cbb5196e1e026edc793e7e61240afb4c2bf3 (diff) | |
download | easel-58cdd2b5af7c3299176b62c55e290f49d2284389.tar.gz |
Snap for 8120673 from 6079cbb5196e1e026edc793e7e61240afb4c2bf3 to tm-releaseandroid-vts-13.0_r8android-vts-13.0_r7android-vts-13.0_r6android-vts-13.0_r5android-vts-13.0_r4android-vts-13.0_r3android-vts-13.0_r2android-vts-13.0_r1android-security-13.0.0_r9android-security-13.0.0_r8android-security-13.0.0_r7android-security-13.0.0_r6android-security-13.0.0_r5android-security-13.0.0_r4android-security-13.0.0_r3android-security-13.0.0_r2android-security-13.0.0_r18android-security-13.0.0_r17android-security-13.0.0_r16android-security-13.0.0_r15android-security-13.0.0_r14android-security-13.0.0_r13android-security-13.0.0_r12android-security-13.0.0_r11android-security-13.0.0_r10android-security-13.0.0_r1android-platform-13.0.0_r9android-platform-13.0.0_r8android-platform-13.0.0_r7android-platform-13.0.0_r6android-platform-13.0.0_r5android-platform-13.0.0_r4android-platform-13.0.0_r3android-platform-13.0.0_r20android-platform-13.0.0_r2android-platform-13.0.0_r19android-platform-13.0.0_r18android-platform-13.0.0_r17android-platform-13.0.0_r16android-platform-13.0.0_r15android-platform-13.0.0_r14android-platform-13.0.0_r13android-platform-13.0.0_r12android-platform-13.0.0_r11android-platform-13.0.0_r10android-platform-13.0.0_r1android-cts-13.0_r8android-cts-13.0_r7android-cts-13.0_r6android-cts-13.0_r5android-cts-13.0_r4android-cts-13.0_r3android-cts-13.0_r2android-cts-13.0_r1android-13.0.0_r8android-13.0.0_r7android-13.0.0_r6android-13.0.0_r5android-13.0.0_r4android-13.0.0_r31android-13.0.0_r3android-13.0.0_r2android-13.0.0_r12android-13.0.0_r1android13-tests-releaseandroid13-security-releaseandroid13-s3-releaseandroid13-s2-releaseandroid13-s1-releaseandroid13-releaseandroid13-platform-releaseandroid13-gsi
Change-Id: I17db2662a6e915c7839fc56b4ac1f4b75e23ef45
-rw-r--r-- | Android.bp | 29 | ||||
-rw-r--r-- | amber/camera/Android.bp | 5 |
2 files changed, 1 insertions, 33 deletions
diff --git a/Android.bp b/Android.bp deleted file mode 100644 index 474ca05..0000000 --- a/Android.bp +++ /dev/null @@ -1,29 +0,0 @@ -// -// 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 c72e035..53de249 100644 --- a/amber/camera/Android.bp +++ b/amber/camera/Android.bp @@ -16,10 +16,7 @@ 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"], + default_applicable_licenses: ["Android-Apache-2.0"], } cc_library_headers { |