| commit | cf563fbc66349d11561f1503ab28ad8b8b08c752 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Sat Mar 06 05:15:01 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Mar 06 05:15:01 2021 +0000 |
| tree | 40c5b869e9e806dfe0aedf9c2984a1ad2f0e0120 | |
| parent | a0730f1e10a7ea0640893b578ea8c877eb5f9bb6 [diff] | |
| parent | 93aed30ec74a4bec2805a2d05459042f1f427108 [diff] |
Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/av" am: 93aed30ec7 Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1622008 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I00592a622ef2678017ce456dc152b8245f8126f9
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: [