diff options
| author | 2021-04-07 04:16:14 +0000 | |
|---|---|---|
| committer | 2021-04-07 04:16:14 +0000 | |
| commit | 5dd50076fea36880a135270b12e6c327bef1d07c (patch) | |
| tree | 88a07a99c1f49a7b421ee75d52d0360e271173a9 | |
| parent | 6e298f72133283efa9a79349ae27394096a179d7 (diff) | |
| parent | 8410eca9e83b6f863fb7877c8678d01f65126bb2 (diff) | |
Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/native" am: 8410eca9e8
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1666092
Change-Id: I29ced053d9b4f4e60715661d608ea8a11b9af688
| -rw-r--r-- | services/memtrackproxy/Android.bp | 9 | ||||
| -rw-r--r-- | services/memtrackproxy/test/Android.bp | 9 |
2 files changed, 18 insertions, 0 deletions
diff --git a/services/memtrackproxy/Android.bp b/services/memtrackproxy/Android.bp index ee8b247194..7d78f3b2cf 100644 --- a/services/memtrackproxy/Android.bp +++ b/services/memtrackproxy/Android.bp @@ -12,6 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "frameworks_native_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["frameworks_native_license"], +} + cc_library_shared { name: "libmemtrackproxy", shared_libs: [ diff --git a/services/memtrackproxy/test/Android.bp b/services/memtrackproxy/test/Android.bp index e5ad8dccb2..f943761ee8 100644 --- a/services/memtrackproxy/test/Android.bp +++ b/services/memtrackproxy/test/Android.bp @@ -12,6 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "frameworks_native_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["frameworks_native_license"], +} + cc_test { name: "memtrackproxy_test", srcs: [ |