commit 94388cfc18059ff12456a89f07f2546917f4914d
author Treehugger Robot <treehugger-gerrit@google.com> Wed Apr 21 20:01:10 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Apr 21 20:01:10 2021 +0000
tree 62c850a2e3b42ae77f8f6c8cfb47b1b94826906d
parent ed39f2ec94540f5ffa162a7e3df549924d2c1bf1
parent e948eba8a8dfa2b7828b8363ff7e3f153016a30b

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

Android.mk

diff --git a/Android.mk b/Android.mk
index cebce76..509fbd4 100644
--- a/Android.mk
+++ b/Android.mk
@@ -35,6 +35,8 @@
 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
 

tests/Android.mk

diff --git a/tests/Android.mk b/tests/Android.mk
index 3d8a8b7..829e17c 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -10,6 +10,8 @@
 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