Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4e65e3d3 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove LOCAL_LICENSE_KINDS from core makefiles." am: 6d89e4a9 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I36309b81f9fc021d3a4b2835f643a07e80e6248f
parents 27d92775 6d89e4a9

core/base_rules.mk

+0 −2
Original line number Diff line number Diff line
@@ -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

core/dex_preopt_libart.mk

+0 −2
Original line number Diff line number Diff line
@@ -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))

core/package_internal.mk

+0 −2
Original line number Diff line number Diff line
@@ -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)

core/tasks/tools/package-modules.mk

+0 −2
Original line number Diff line number Diff line
@@ -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