commit 17831e3da30a3e4f32d632336cf31736612fe7da
author Bob Badour <bbadour@google.com> Tue Feb 16 04:37:23 2021 -0800
committer Bob Badour <bbadour@google.com> Tue Feb 16 04:37:23 2021 -0800
tree b982cb8f65ffbe7b13831c36ee88b1684a13d7d5
parent 14201eb3a30eb692707c11e8a3cf5a1f60b1d4cb

Remove LOCAL_LICENSE_KINDS from core makefiles.

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all
Change-Id: I4deec3e07862e89dd32880774efb4624a9723cf2

core/base_rules.mk

diff --git a/core/base_rules.mk b/core/base_rules.mk
index 196dc48..68f880f 100644
--- a/core/base_rules.mk
+++ b/core/base_rules.mk
@@ -28,8 +28,6 @@
 ###########################################################
 
 LOCAL_MODULE := $(strip $(LOCAL_MODULE))
-LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD SPDX-license-identifier-GPL SPDX-license-identifier-GPL-2.0 SPDX-license-identifier-LGPL SPDX-license-identifier-MIT
-LOCAL_LICENSE_CONDITIONS := notice restricted
 ifeq ($(LOCAL_MODULE),)
   $(error $(LOCAL_PATH): LOCAL_MODULE is not defined)
 endif

core/dex_preopt_libart.mk

diff --git a/core/dex_preopt_libart.mk b/core/dex_preopt_libart.mk
index d693320..8f0702b 100644
--- a/core/dex_preopt_libart.mk
+++ b/core/dex_preopt_libart.mk
@@ -60,8 +60,6 @@
 
   include $(CLEAR_VARS)
   LOCAL_MODULE := dexpreopt_bootjar.$(my_suffix)
-  LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD SPDX-license-identifier-GPL SPDX-license-identifier-GPL-2.0 SPDX-license-identifier-LGPL SPDX-license-identifier-MIT
-  LOCAL_LICENSE_CONDITIONS := notice restricted
   LOCAL_PREBUILT_MODULE_FILE := $(my_first_src)
   LOCAL_MODULE_PATH := $(dir $(my_first_dest))
   LOCAL_MODULE_STEM := $(notdir $(my_first_dest))

core/package_internal.mk

diff --git a/core/package_internal.mk b/core/package_internal.mk
index 6cb1589..1b40624 100644
--- a/core/package_internal.mk
+++ b/core/package_internal.mk
@@ -39,8 +39,6 @@
 $(error $(LOCAL_PATH): Package modules may not define LOCAL_MODULE)
 endif
 LOCAL_MODULE := $(LOCAL_PACKAGE_NAME)
-LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD SPDX-license-identifier-GPL SPDX-license-identifier-GPL-2.0 SPDX-license-identifier-LGPL SPDX-license-identifier-MIT
-LOCAL_LICENSE_CONDITIONS := notice restricted
 
 ifneq ($(strip $(LOCAL_MODULE_CLASS)),)
 $(error $(LOCAL_PATH): Package modules may not set LOCAL_MODULE_CLASS)

core/tasks/tools/package-modules.mk

diff --git a/core/tasks/tools/package-modules.mk b/core/tasks/tools/package-modules.mk
index 63a25b5..2b43f0f 100644
--- a/core/tasks/tools/package-modules.mk
+++ b/core/tasks/tools/package-modules.mk
@@ -19,8 +19,6 @@
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := $(my_package_name)
-LOCAL_LICENSE_KINDS := legacy_restricted
-LOCAL_LICENSE_CONDITIONS := restricted
 LOCAL_MODULE_CLASS := PACKAGING
 LOCAL_MODULE_STEM := $(my_package_name).zip
 LOCAL_UNINSTALLABLE_MODULE := true