diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-04-21 20:20:15 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-21 20:20:15 +0000 |
| commit | 5729362442e88937f0d28853772c4b9cee5feddf (patch) | |
| tree | 833eb2134f58a28ecd78f54e112e753684509ad7 | |
| parent | 03057b6dea12eea011ed62e5e84c5d6b3b00e1b6 (diff) | |
| parent | cf0fdce0dee4f577f8f2c0b264420845f9baf85f (diff) | |
| download | Calendar-android12-mainline-networkstack-release.tar.gz | |
Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Calendar" am: 804b0c25f2 am: 9cdf0df32f am: 9ef53f533e am: cf0fdce0deandroid-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/Calendar/+/1682211
Change-Id: Iada102d7c4a8b3416527b595721d214eb6fd6eb4
| -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 |