diff options
author | Bob Badour <bbadour@google.com> | 2021-04-21 20:01:06 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-21 20:01:06 +0000 |
commit | 9369391c9385cb7cc880dc03ec34706332ba4176 (patch) | |
tree | fc1d9b27fc316702df1d047d29055251d7cea7b7 | |
parent | c03c23b734ccf6860a3f9623c736295ab76067e7 (diff) | |
parent | c02114f3a16c0ca825b4153b5ee20d8a0e6dd4d9 (diff) | |
download | TimeZoneData-android12-qpr3-s5-release.tar.gz |
[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/TimeZoneData am: f46df74c79 am: 0461b0a00f am: c02114f3a1android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-dev
Original change: https://android-review.googlesource.com/c/platform/packages/apps/TimeZoneData/+/1682227
Change-Id: Iee5ce96d221cfd7742a8598ec2876fa3ebf6bef9
-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) |