Merge a886e5f6ebfab16bf15569bed739b0a2e0b83820 on remote branch
Change-Id: Iad65f4086ecd8215c3b27e3135b6c89d3fd3db67
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 {