openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge "Remove LOCAL_LICENSE_KINDS from core makefiles." am: 6d89e4a9e1 am: 4e65e3d319 am: 865bab3587 

Original change: https://android-review.googlesource.com/c/platform/build/+/1589812

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I48b430e1e35507a2e09320321da4f625db2a0e00
This commit is contained in:
Treehugger Robot 2021-02-16 19:02:42 +00:00 committed by Automerger Merge Worker
parent b21535182b 865bab3587
commit 1159836191
4 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/base_rules.mk
View File

@ -28,8 +28,6 @@ endif
########################################################### ###########################################################
LOCAL_MODULE := $(strip $(LOCAL_MODULE)) 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),) ifeq ($(LOCAL_MODULE),)
$(error $(LOCAL_PATH): LOCAL_MODULE is not defined) $(error $(LOCAL_PATH): LOCAL_MODULE is not defined)
endif endif

2
core/dex_preopt_libart.mk
View File

@ -60,8 +60,6 @@ ifneq (,$(my_copy_pairs))
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := dexpreopt_bootjar.$(my_suffix) 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_PREBUILT_MODULE_FILE := $(my_first_src)
LOCAL_MODULE_PATH := $(dir $(my_first_dest)) LOCAL_MODULE_PATH := $(dir $(my_first_dest))
LOCAL_MODULE_STEM := $(notdir $(my_first_dest)) LOCAL_MODULE_STEM := $(notdir $(my_first_dest))

2
core/package_internal.mk
View File

@ -39,8 +39,6 @@ ifneq ($(strip $(LOCAL_MODULE)),)
$(error $(LOCAL_PATH): Package modules may not define LOCAL_MODULE) $(error $(LOCAL_PATH): Package modules may not define LOCAL_MODULE)
endif endif
LOCAL_MODULE := $(LOCAL_PACKAGE_NAME) 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)),) ifneq ($(strip $(LOCAL_MODULE_CLASS)),)
$(error $(LOCAL_PATH): Package modules may not set LOCAL_MODULE_CLASS) $(error $(LOCAL_PATH): Package modules may not set LOCAL_MODULE_CLASS)

2
core/tasks/tools/package-modules.mk
View File

@ -19,8 +19,6 @@ my_makefile := $(lastword $(filter-out $(lastword $(MAKEFILE_LIST)),$(MAKEFILE_L
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := $(my_package_name) LOCAL_MODULE := $(my_package_name)
LOCAL_LICENSE_KINDS := legacy_restricted
LOCAL_LICENSE_CONDITIONS := restricted
LOCAL_MODULE_CLASS := PACKAGING LOCAL_MODULE_CLASS := PACKAGING
LOCAL_MODULE_STEM := $(my_package_name).zip LOCAL_MODULE_STEM := $(my_package_name).zip
LOCAL_UNINSTALLABLE_MODULE := true LOCAL_UNINSTALLABLE_MODULE := true