| commit | 394691f33cdaca8a26c2cc356cf68eecce9c9ca3 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Sat Mar 06 05:37:23 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Mar 06 05:37:23 2021 +0000 |
| tree | f0b25fe806e64089515edacacb5077010564621a | |
| parent | 95ab878bb0a36da43640cc65888d4a8e8fb6f33b [diff] | |
| parent | cf563fbc66349d11561f1503ab28ad8b8b08c752 [diff] |
Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/av" am: 93aed30ec7 am: cf563fbc66 Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1622008 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I812f62d03d2c23a95801ea27cd4cba2c2f63386c
diff --git a/services/audiopolicy/engine/config/tests/Android.bp b/services/audiopolicy/engine/config/tests/Android.bp index 6b0774f..5791f17 100644 --- a/services/audiopolicy/engine/config/tests/Android.bp +++ b/services/audiopolicy/engine/config/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 "frameworks_av_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["frameworks_av_license"], +} + cc_test { name: "audiopolicy_engineconfig_tests",
diff --git a/services/audiopolicy/engine/config/tests/resources/Android.bp b/services/audiopolicy/engine/config/tests/resources/Android.bp index 0aee0e9..9cee978 100644 --- a/services/audiopolicy/engine/config/tests/resources/Android.bp +++ b/services/audiopolicy/engine/config/tests/resources/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 "frameworks_av_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["frameworks_av_license"], +} + filegroup { name: "audiopolicy_engineconfig_files", srcs: [