Fix license texts. am: c7402775f3 am: 9e9e929f80

Original change: https://android-review.googlesource.com/c/platform/hardware/google/camera/+/1959716

Change-Id: I6a1cb15e625ad54ac2a528b7d59ffe26c899eeaf

9 files changed, 10 insertions, 73 deletions

diff --git a/Android.bp b/Android.bp
index 7a17843..c199173 100644
--- a/Android.bp
+++ b/Android.bp
@@ -2,30 +2,6 @@ soong_namespace {
 }
 
 package {
-    default_applicable_licenses: ["hardware_google_camera_license"],
-}
-
-// Added automatically by a large-scale-change that took the approach of
-// 'apply every license found to every target'. While this makes sure we respect
-// every license restriction, it may not be entirely correct.
-//
-// e.g. GPL in an MIT project might only apply to the contrib/ directory.
-//
-// Please consider splitting the single license below into multiple licenses,
-// taking care not to lose any license_kind information, and overriding the
-// default license using the 'licenses: [...]' property on targets as needed.
-//
-// For unused files, consider creating a 'fileGroup' with "//visibility:private"
-// to attach the license to, and including a comment whether the files may be
-// used in the current project.
-// See: http://go/android-license-faq
-license {
-    name: "hardware_google_camera_license",
-    visibility: [":__subpackages__"],
-    license_kinds: [
-        "SPDX-license-identifier-Apache-2.0",
-        "SPDX-license-identifier-BSD",
-        "legacy_unencumbered",
-    ],
-    // large-scale-change unable to identify any license_text files
+    // See: http://go/android-license-faq
+    default_applicable_licenses: ["Android-Apache-2.0"],
 }
diff --git a/common/hal/Android.bp b/common/hal/Android.bp
index 406b435..7726ddd 100644
--- a/common/hal/Android.bp
+++ b/common/hal/Android.bp
@@ -16,13 +16,7 @@
 
 package {
     // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "hardware_google_camera_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    //   SPDX-license-identifier-BSD
-    //   legacy_unencumbered
-    default_applicable_licenses: ["hardware_google_camera_license"],
+    default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
 cc_library_headers {
diff --git a/common/hal/google_camera_hal/Android.bp b/common/hal/google_camera_hal/Android.bp
index 8155491..3850283 100644
--- a/common/hal/google_camera_hal/Android.bp
+++ b/common/hal/google_camera_hal/Android.bp
@@ -16,11 +16,7 @@
 
 package {
     // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "hardware_google_camera_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["hardware_google_camera_license"],
+    default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
 soong_config_module_type_import {
diff --git a/common/hal/tests/Android.bp b/common/hal/tests/Android.bp
index 88d7ce0..0535c45 100644
--- a/common/hal/tests/Android.bp
+++ b/common/hal/tests/Android.bp
@@ -16,11 +16,7 @@
 
 package {
     // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "hardware_google_camera_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["hardware_google_camera_license"],
+    default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
 cc_library_headers {
diff --git a/common/hal/utils/Android.bp b/common/hal/utils/Android.bp
index 635a798..1b428ef 100644
--- a/common/hal/utils/Android.bp
+++ b/common/hal/utils/Android.bp
@@ -16,12 +16,7 @@
 
 package {
     // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "hardware_google_camera_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    //   legacy_unencumbered
-    default_applicable_licenses: ["hardware_google_camera_license"],
+    default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
 cc_library_shared {
diff --git a/common/lib_depth_generator/Android.bp b/common/lib_depth_generator/Android.bp
index 8c9ce11..01b816e 100644
--- a/common/lib_depth_generator/Android.bp
+++ b/common/lib_depth_generator/Android.bp
@@ -16,11 +16,7 @@
 
 package {
     // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "hardware_google_camera_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["hardware_google_camera_license"],
+    default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
 cc_library_headers {
diff --git a/common/profiler/Android.bp b/common/profiler/Android.bp
index a8a6f1f..990d148 100644
--- a/common/profiler/Android.bp
+++ b/common/profiler/Android.bp
@@ -16,11 +16,7 @@
 
 package {
     // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "hardware_google_camera_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["hardware_google_camera_license"],
+    default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
 cc_library_static {
diff --git a/devices/EmulatedCamera/Android.bp b/devices/EmulatedCamera/Android.bp
index 6b84cec..b8b5f87 100644
--- a/devices/EmulatedCamera/Android.bp
+++ b/devices/EmulatedCamera/Android.bp
@@ -6,11 +6,5 @@ soong_namespace {
 
 package {
     // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "//hardware/google/camera:hardware_google_camera_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: [
-        "//hardware/google/camera:hardware_google_camera_license",
-    ],
+    default_applicable_licenses: ["Android-Apache-2.0"],
 }
diff --git a/devices/EmulatedCamera/hwl/Android.bp b/devices/EmulatedCamera/hwl/Android.bp
index a195bfd..be0c8b5 100644
--- a/devices/EmulatedCamera/hwl/Android.bp
+++ b/devices/EmulatedCamera/hwl/Android.bp
@@ -1,12 +1,6 @@
 package {
     // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "//hardware/google/camera:hardware_google_camera_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: [
-        "//hardware/google/camera:hardware_google_camera_license",
-    ],
+    default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
 cc_library_shared {