From 17831e3da30a3e4f32d632336cf31736612fe7da Mon Sep 17 00:00:00 2001 From: Bob Badour Date: Tue, 16 Feb 2021 04:37:23 -0800 Subject: [PATCH] Remove LOCAL_LICENSE_KINDS from core makefiles. Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Change-Id: I4deec3e07862e89dd32880774efb4624a9723cf2 --- core/base_rules.mk | 2 -- core/dex_preopt_libart.mk | 2 -- core/package_internal.mk | 2 -- core/tasks/tools/package-modules.mk | 2 -- 4 files changed, 8 deletions(-) diff --git a/core/base_rules.mk b/core/base_rules.mk index 196dc4830..68f880f26 100644 --- a/core/base_rules.mk +++ b/core/base_rules.mk @@ -28,8 +28,6 @@ endif ########################################################### 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 diff --git a/core/dex_preopt_libart.mk b/core/dex_preopt_libart.mk index d69332083..8f0702ba6 100644 --- a/core/dex_preopt_libart.mk +++ b/core/dex_preopt_libart.mk @@ -60,8 +60,6 @@ ifneq (,$(my_copy_pairs)) 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)) diff --git a/core/package_internal.mk b/core/package_internal.mk index 6cb1589a1..1b4062429 100644 --- a/core/package_internal.mk +++ b/core/package_internal.mk @@ -39,8 +39,6 @@ ifneq ($(strip $(LOCAL_MODULE)),) $(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) diff --git a/core/tasks/tools/package-modules.mk b/core/tasks/tools/package-modules.mk index 63a25b502..2b43f0fed 100644 --- a/core/tasks/tools/package-modules.mk +++ b/core/tasks/tools/package-modules.mk @@ -19,8 +19,6 @@ my_makefile := $(lastword $(filter-out $(lastword $(MAKEFILE_LIST)),$(MAKEFILE_L 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