diff options
Diffstat (limited to 'common')
-rw-r--r-- | common/hal/Android.bp | 8 | ||||
-rw-r--r-- | common/hal/google_camera_hal/Android.bp | 6 | ||||
-rw-r--r-- | common/hal/tests/Android.bp | 6 | ||||
-rw-r--r-- | common/hal/utils/Android.bp | 7 | ||||
-rw-r--r-- | common/lib_depth_generator/Android.bp | 6 | ||||
-rw-r--r-- | common/profiler/Android.bp | 6 |
6 files changed, 6 insertions, 33 deletions
diff --git a/common/hal/Android.bp b/common/hal/Android.bp index 24b96a9..f953dc8 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 e81826a..15048a8 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 { |