| commit | d0157cc9e775fc6240e1ba9633b4ab44ab12bf5d | [log] [tgz] |
|---|---|---|
| author | Bob Badour <bbadour@google.com> | Wed Apr 21 20:21:46 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Apr 21 20:21:46 2021 +0000 |
| tree | fc1d9b27fc316702df1d047d29055251d7cea7b7 | |
| parent | c03c23b734ccf6860a3f9623c736295ab76067e7 [diff] | |
| parent | 9369391c9385cb7cc880dc03ec34706332ba4176 [diff] |
[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/TimeZoneData am: f46df74c79 am: 0461b0a00f am: c02114f3a1 am: 9369391c93 Original change: https://android-review.googlesource.com/c/platform/packages/apps/TimeZoneData/+/1682227 Change-Id: I09e69578012fe6a0b2e77ccbd55dcd9899dd8db4
diff --git a/oem_template/data_app/build_oem_data_app.mk b/oem_template/data_app/build_oem_data_app.mk index 0c45ff1..0cb2bc0 100644 --- a/oem_template/data_app/build_oem_data_app.mk +++ b/oem_template/data_app/build_oem_data_app.mk
@@ -38,6 +38,8 @@ LOCAL_FULL_MANIFEST_FILE := $(OEM_APP_PATH)/AndroidManifest.xml LOCAL_PACKAGE_NAME := TimeZoneData$(TIME_ZONE_DATA_APP_SUFFIX) +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice LOCAL_AAPT_FLAGS := --version-code $(TIME_ZONE_DATA_APP_VERSION_CODE) \ --version-name $(TIME_ZONE_DATA_APP_VERSION_NAME)