diff options
| author | Bob Badour <bbadour@google.com> | 2021-04-21 20:20:12 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-21 20:20:12 +0000 |
| commit | 7802874536082218e4e98284f915e3e3ed273216 (patch) | |
| tree | fc1d9b27fc316702df1d047d29055251d7cea7b7 | |
| parent | 0ff4497d2f107d21535212b9a2614b9458836b6f (diff) | |
| parent | 9369391c9385cb7cc880dc03ec34706332ba4176 (diff) | |
| download | TimeZoneData-7802874536082218e4e98284f915e3e3ed273216.tar.gz | |
[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/TimeZoneData am: f46df74c79 am: 0461b0a00f am: c02114f3a1 am: 9369391c93android-mainline-12.0.0_r99android-mainline-12.0.0_r98android-mainline-12.0.0_r77android-mainline-12.0.0_r70android-mainline-12.0.0_r69android-mainline-12.0.0_r63android-mainline-12.0.0_r59android-mainline-12.0.0_r56android-mainline-12.0.0_r5android-mainline-12.0.0_r49android-mainline-12.0.0_r42android-mainline-12.0.0_r39android-mainline-12.0.0_r22android-mainline-12.0.0_r19android-mainline-12.0.0_r122android-mainline-12.0.0_r115android-mainline-12.0.0_r113android-mainline-12.0.0_r100aml_tz3_311312010android12-mainline-networkstack-releaseandroid12-mainline-art-release
Original change: https://android-review.googlesource.com/c/platform/packages/apps/TimeZoneData/+/1682227
Change-Id: Ice5b0db4d5e5fc251b7803183f249d553e775405
| -rw-r--r-- | oem_template/data_app/build_oem_data_app.mk | 2 |
1 files changed, 2 insertions, 0 deletions
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_SDK_VERSION := system_current 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) |