diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-04-21 20:01:10 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-21 20:01:10 +0000 |
| commit | 94388cfc18059ff12456a89f07f2546917f4914d (patch) | |
| tree | 62c850a2e3b42ae77f8f6c8cfb47b1b94826906d | |
| parent | ed39f2ec94540f5ffa162a7e3df549924d2c1bf1 (diff) | |
| parent | e948eba8a8dfa2b7828b8363ff7e3f153016a30b (diff) | |
| download | Camera2-94388cfc18059ff12456a89f07f2546917f4914d.tar.gz | |
Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Camera2" am: df29d3b494 am: 4870a60b6c am: e948eba8a8
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Camera2/+/1682288
Change-Id: Ia39b2b6fe2838995270817e215f0be4a4be7f123
| -rw-r--r-- | Android.mk | 2 | ||||
| -rw-r--r-- | tests/Android.mk | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk index cebce76f4..509fbd4e3 100644 --- a/Android.mk +++ b/Android.mk @@ -35,6 +35,8 @@ LOCAL_AAPT_FLAGS := \ LOCAL_USE_AAPT2 := true LOCAL_PACKAGE_NAME := Camera2 +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice LOCAL_SDK_VERSION := current diff --git a/tests/Android.mk b/tests/Android.mk index 3d8a8b779..829e17cfc 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -10,6 +10,8 @@ LOCAL_SDK_VERSION := 16 LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := Camera2Tests +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice LOCAL_INSTRUMENTATION_FOR := Camera2 |