diff options
| author | Bob Badour <bbadour@google.com> | 2021-02-20 17:23:08 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-20 17:23:08 +0000 |
| commit | b564797180bdd8b81656cc445fdadc7fc9cd8e95 (patch) | |
| tree | 2c2682fdbb00b8c2e2b46ebffd736ffde73b3f61 | |
| parent | c9e406868dd3bcc8dc0e794cfd108e5b899c843b (diff) | |
| parent | cc3e9f4010f23570cdeb76ab711e8a9e3f889d9e (diff) | |
| download | av-b564797180bdd8b81656cc445fdadc7fc9cd8e95.tar.gz | |
[LSC] Add LOCAL_LICENSE_KINDS to hardware/google/av am: a172cfd55a am: 2ec36f033a am: cc3e9f4010
Original change: https://android-review.googlesource.com/c/platform/hardware/google/av/+/1588478
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I62d9a6fe9169e592f73c0825b26bf79663d10c1e
| -rw-r--r-- | Android.bp | 15 | ||||
| -rw-r--r-- | media/eco/Android.bp | 9 | ||||
| -rw-r--r-- | media/eco/tests/Android.bp | 11 |
3 files changed, 34 insertions, 1 deletions
@@ -3,3 +3,18 @@ soong_namespace { "hardware/google/interfaces", ], } + +package { + default_applicable_licenses: ["hardware_google_av_license"], +} + +// Added automatically by a large-scale-change +// See: http://go/android-license-faq +license { + name: "hardware_google_av_license", + visibility: [":__subpackages__"], + license_kinds: [ + "SPDX-license-identifier-Apache-2.0", + ], + // large-scale-change unable to identify any license_text files +} diff --git a/media/eco/Android.bp b/media/eco/Android.bp index 4430208..7289f7a 100644 --- a/media/eco/Android.bp +++ b/media/eco/Android.bp @@ -1,3 +1,12 @@ +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_av_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["hardware_google_av_license"], +} + filegroup { name: "libmedia_ecoservice_aidl", srcs: [ diff --git a/media/eco/tests/Android.bp b/media/eco/tests/Android.bp index 6eb3015..40e14bf 100644 --- a/media/eco/tests/Android.bp +++ b/media/eco/tests/Android.bp @@ -1,3 +1,12 @@ +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_av_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["hardware_google_av_license"], +} + cc_defaults{ name : "libmedia_ecoservice_tests_defaults", cflags : [ @@ -54,4 +63,4 @@ cc_test { "liblog", "libmedia_ecoservice", ], -}
\ No newline at end of file +} |