aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2021-04-21 20:19:43 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-04-21 20:19:43 +0000
commit5db16dbaf38bbd0e25d35f05ee1b782d12203338 (patch)
treee4f835acc875df5e5ae05f29591ed1e8669faec6
parentfe3e7bd6ecd5aa8d354c24ae266de5190976acd8 (diff)
parentb7529718e5650816bf1b9dd063f6b1f21be1bf5c (diff)
downloadandroid-5db16dbaf38bbd0e25d35f05ee1b782d12203338.tar.gz
Merge "[LSC] Add LOCAL_LICENSE_KINDS to developers/samples/android" am: 7d23920f2b am: c0d9c71791 am: 02af27736f am: b7529718e5
Original change: https://android-review.googlesource.com/c/platform/developers/samples/android/+/1682207 Change-Id: I6482bb235c6191ceb086e75c1c822289d15fa41a
-rw-r--r--security/FingerprintDialog/Application/src/main/Android.mk2
1 files changed, 2 insertions, 0 deletions
diff --git a/security/FingerprintDialog/Application/src/main/Android.mk b/security/FingerprintDialog/Application/src/main/Android.mk
index 54ec850e..796e182f 100644
--- a/security/FingerprintDialog/Application/src/main/Android.mk
+++ b/security/FingerprintDialog/Application/src/main/Android.mk
@@ -22,6 +22,8 @@ LOCAL_STATIC_ANDROID_LIBRARIES := \
LOCAL_MODULE_TAGS := samples
LOCAL_SRC_FILES := $(call all-subdir-java-files)
LOCAL_PACKAGE_NAME := FingerprintDialog
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
+LOCAL_LICENSE_CONDITIONS := notice
LOCAL_SDK_VERSION := current
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res \
prebuilts/sdk/current/support/v7/appcompat/res