diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-04-21 19:01:42 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-21 19:01:42 +0000 |
| commit | 9cdf0df32fed6dca5b3da1af27f62f2d7a48d6c9 (patch) | |
| tree | 833eb2134f58a28ecd78f54e112e753684509ad7 | |
| parent | 23682675c24723f520ca770bfde8cac35f54f0f3 (diff) | |
| parent | 804b0c25f2128871bbc4d39b0816c358eb71834b (diff) | |
| download | Calendar-9cdf0df32fed6dca5b3da1af27f62f2d7a48d6c9.tar.gz | |
Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Calendar" am: 804b0c25f2
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/1682211
Change-Id: I9db7379dea3e7f0cbf4940227ac3f0a94b739327
| -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 |