diff options
| author | Bob Badour <bbadour@google.com> | 2022-01-26 00:52:12 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-01-26 00:52:12 +0000 |
| commit | 0ec63194dc534d2921dddb13276ae52c7a227880 (patch) | |
| tree | d89c870f8282050a184590314faef3c890b61394 | |
| parent | 857b61ecbb94ba0d41c888f60196c75ace210ce1 (diff) | |
| parent | 0f1e4c0309a4070a5dbe13cfaec1bc4015d3d115 (diff) | |
| download | easel-0ec63194dc534d2921dddb13276ae52c7a227880.tar.gz | |
Fix license texts. am: 0f1e4c0309
Original change: https://android-review.googlesource.com/c/platform/hardware/google/easel/+/1959710
Change-Id: I1fa5ac6a8c08442f1819a1e91d02ebe8ae51a1c3
| -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 { |