summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2021-04-21 19:28:08 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-04-21 19:28:08 +0000
commit9ef53f533ee33ea624c53cc59b185478b21ad48b (patch)
tree833eb2134f58a28ecd78f54e112e753684509ad7
parent60ff0cc4f50fa152b329663e3731db4dcb4ada30 (diff)
parent9cdf0df32fed6dca5b3da1af27f62f2d7a48d6c9 (diff)
downloadCalendar-9ef53f533ee33ea624c53cc59b185478b21ad48b.tar.gz
Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Calendar" am: 804b0c25f2 am: 9cdf0df32f
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/1682211 Change-Id: I81a4759e5369be6e29f1aac3390b76f817f3d866
-rw-r--r--Android.mk3
-rw-r--r--tests/Android.mk3
2 files changed, 6 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index 82d5d54a..dce26a46 100644
--- a/Android.mk
+++ b/Android.mk
@@ -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