Commit f4cd0b7e authored Apr 24, 2021 by Treehugger Robot Committed by Automerger Merge Worker Apr 24, 2021

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

Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" am: aa21d775 am: 58a6b364 am: 1cacb3d4 am: 05e6dd50

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

Change-Id: If3b9eb9e6bc89f31339f0c8e8f0e1144910fe237

tests/backup/Android.mk

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -47,4 +47,7 @@ LOCAL_PRIVATE_PLATFORM_APIS := true

	LOCAL_PROGUARD_ENABLED := disabled		LOCAL_PROGUARD_ENABLED := disabled

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