Commit a0cb58fa authored Apr 26, 2021 by Treehugger Robot Committed by Automerger Merge Worker Apr 26, 2021

Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" am: e7a1ee82 am:...

Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" am: e7a1ee82 am: 2c363d2d am: b3527b07 am: fa48e292

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1686987

Change-Id: I8d8b2b03d7d372c81377b2c59a9b155274ef076c

tests/DynamicCodeLoggerIntegrationTests/Android.mk

+3 −0

Original line number	Diff line number	Diff line
		@@ -89,4 +89,7 @@ LOCAL_JAVA_RESOURCE_FILES := \
		$(dynamiccodeloggertest_jar) \
		$(dynamiccodeloggertest_executable) \

		LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
		LOCAL_LICENSE_CONDITIONS := notice
		LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../NOTICE
		include $(BUILD_PACKAGE)