diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2021-04-22 01:08:06 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2021-04-22 01:08:06 +0000 |
commit | 65326889be44d484b6b38e696e3ce23c862ea058 (patch) | |
tree | 833eb2134f58a28ecd78f54e112e753684509ad7 | |
parent | 3256e683fe2b40fa0865c10576746c6cef4a5b2a (diff) | |
parent | cf0fdce0dee4f577f8f2c0b264420845f9baf85f (diff) | |
download | Calendar-65326889be44d484b6b38e696e3ce23c862ea058.tar.gz |
Snap for 7302914 from cf0fdce0dee4f577f8f2c0b264420845f9baf85f to sc-releaseandroid-vts-12.0_r9android-vts-12.0_r8android-vts-12.0_r7android-vts-12.0_r6android-vts-12.0_r5android-vts-12.0_r4android-vts-12.0_r3android-vts-12.0_r2android-vts-12.0_r12android-vts-12.0_r11android-vts-12.0_r10android-vts-12.0_r1android-security-12.0.0_r59android-security-12.0.0_r58android-security-12.0.0_r57android-security-12.0.0_r56android-security-12.0.0_r55android-security-12.0.0_r54android-security-12.0.0_r53android-security-12.0.0_r52android-security-12.0.0_r51android-security-12.0.0_r50android-security-12.0.0_r49android-security-12.0.0_r48android-security-12.0.0_r47android-security-12.0.0_r46android-security-12.0.0_r45android-security-12.0.0_r44android-security-12.0.0_r43android-security-12.0.0_r42android-security-12.0.0_r41android-security-12.0.0_r40android-security-12.0.0_r39android-security-12.0.0_r38android-security-12.0.0_r37android-security-12.0.0_r36android-security-12.0.0_r35android-security-12.0.0_r34android-platform-12.0.0_r1android-cts-12.0_r9android-cts-12.0_r8android-cts-12.0_r7android-cts-12.0_r6android-cts-12.0_r5android-cts-12.0_r4android-cts-12.0_r3android-cts-12.0_r2android-cts-12.0_r12android-cts-12.0_r11android-cts-12.0_r10android-cts-12.0_r1android-12.0.0_r9android-12.0.0_r8android-12.0.0_r34android-12.0.0_r33android-12.0.0_r31android-12.0.0_r30android-12.0.0_r3android-12.0.0_r25android-12.0.0_r2android-12.0.0_r11android-12.0.0_r10android-12.0.0_r1android12-tests-releaseandroid12-security-releaseandroid12-s5-releaseandroid12-s4-releaseandroid12-s3-releaseandroid12-s2-releaseandroid12-s1-releaseandroid12-release
Change-Id: I5ddccb61f532214f66f5305ca053cafb5878c31f
-rw-r--r-- | Android.mk | 3 | ||||
-rw-r--r-- | tests/Android.mk | 3 |
2 files changed, 6 insertions, 0 deletions
@@ -34,6 +34,9 @@ LOCAL_SDK_VERSION := current LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dirs)) LOCAL_PACKAGE_NAME := Calendar +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE LOCAL_PROGUARD_FLAG_FILES := proguard.flags diff --git a/tests/Android.mk b/tests/Android.mk index bacb8c04..2d74b1ee 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -12,6 +12,9 @@ LOCAL_STATIC_JAVA_LIBRARIES := android.test.runner LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := CalendarTests +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../NOTICE LOCAL_INSTRUMENTATION_FOR := Calendar |