From 290679571e3ba3f01d0bf6691ca70114dd5cb14f Mon Sep 17 00:00:00 2001 From: Bob Badour Date: Mon, 26 Apr 2021 16:03:25 -0700 Subject: [PATCH] [LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Launcher3 Added SPDX-license-identifier-Apache-2.0 to: Android.mk Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I68b3eb245ece3476ed1e5a6e08537efb438e5641 Merged-in: Ib2fe11ca0c8937b49323dfb4759a0a8770a5cfa6 Merged-in: I069f0fcd0652dcfd3e9c539e1f9bcb4c9225a10b --- Android.mk | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Android.mk b/Android.mk index 2c595505ff..aff12c5e5f 100644 --- a/Android.mk +++ b/Android.mk @@ -91,6 +91,9 @@ LOCAL_FULL_LIBS_MANIFEST_FILES := $(LOCAL_PATH)/AndroidManifest-common.xml LOCAL_JACK_COVERAGE_INCLUDE_FILTER := com.android.launcher3.* +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE include $(BUILD_PACKAGE) # @@ -124,6 +127,9 @@ LOCAL_FULL_LIBS_MANIFEST_FILES := \ LOCAL_MANIFEST_FILE := go/AndroidManifest.xml LOCAL_JACK_COVERAGE_INCLUDE_FILTER := com.android.launcher3.* +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE include $(BUILD_PACKAGE) # @@ -200,6 +206,9 @@ LOCAL_FULL_LIBS_MANIFEST_FILES := \ LOCAL_MANIFEST_FILE := quickstep/AndroidManifest.xml LOCAL_JACK_COVERAGE_INCLUDE_FILTER := com.android.launcher3.* +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE include $(BUILD_PACKAGE) @@ -250,6 +259,9 @@ LOCAL_FULL_LIBS_MANIFEST_FILES := \ LOCAL_MANIFEST_FILE := quickstep/AndroidManifest.xml LOCAL_JACK_COVERAGE_INCLUDE_FILTER := com.android.launcher3.* +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE include $(BUILD_PACKAGE)