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

Commit 05a2b931 authored by Dan Willemsen's avatar Dan Willemsen
Browse files

Add LOCAL_VENDOR_MODULE as a synonym to LOCAL_PROPRIETARY_MODULE 

The vendor image will have more than just proprietary modules in it
under Treble, so let's stop marking open source code as proprietary just
to move it to vendor.

Bug: 36452052
Test: compare build-aosp_arm.ninja before/after, no changes.
Test: Try defining LOCAL_VENDOR_MODULE / LOCAL_PROPRIETARY_MODULE in the
same and different ways, ensure it works.
Change-Id: I0ab046bcb7563a20d44ed00667e18497ef0873a8
parent 8311d46c

core/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -1355,7 +1355,7 @@ $(pdk_odex_config_mk) : 
	  $(hide) echo "PDK.DEXPREOPT.$(m).MULTILIB:=$(DEXPREOPT.$(m).MULTILIB)" >> $@$(newline)\

	  $(hide) echo "PDK.DEXPREOPT.$(m).DEX_PREOPT_FLAGS:=$(DEXPREOPT.$(m).DEX_PREOPT_FLAGS)" >> $@$(newline)\

	  $(hide) echo "PDK.DEXPREOPT.$(m).PRIVILEGED_MODULE:=$(DEXPREOPT.$(m).PRIVILEGED_MODULE)" >> $@$(newline)\

	  $(hide) echo "PDK.DEXPREOPT.$(m).PROPRIETARY_MODULE:=$(DEXPREOPT.$(m).PROPRIETARY_MODULE)" >> $@$(newline)\

	  $(hide) echo "PDK.DEXPREOPT.$(m).VENDOR_MODULE:=$(DEXPREOPT.$(m).VENDOR_MODULE)" >> $@$(newline)\

	  $(hide) echo "PDK.DEXPREOPT.$(m).TARGET_ARCH:=$(DEXPREOPT.$(m).TARGET_ARCH)" >> $@$(newline)\

	  $(hide) echo "PDK.DEXPREOPT.$(m).STRIPPED_SRC:=$(patsubst $(PRODUCT_OUT)/%,%,$(DEXPREOPT.$(m).INSTALLED_STRIPPED))" >> $@$(newline)\

	  )

core/base_rules.mk

+11 −1
Original line number Diff line number Diff line
@@ -65,6 +65,16 @@ else 
  my_host_cross :=

endif



ifndef LOCAL_PROPRIETARY_MODULE

  LOCAL_PROPRIETARY_MODULE := $(LOCAL_VENDOR_MODULE)

endif

ifndef LOCAL_VENDOR_MODULE

  LOCAL_VENDOR_MODULE := $(LOCAL_PROPRIETARY_MODULE)

endif

ifneq ($(filter-out $(LOCAL_PROPRIETARY_MODULE),$(LOCAL_VENDOR_MODULE))$(filter-out $(LOCAL_VENDOR_MODULE),$(LOCAL_PROPRIETARY_MODULE)),)

$(call pretty-error,Only one of LOCAL_PROPRIETARY_MODULE[$(LOCAL_PROPRIETARY_MODULE)] and LOCAL_VENDOR_MODULE[$(LOCAL_VENDOR_MODULE)] may be set, or they must be equal)

endif



include $(BUILD_SYSTEM)/local_vndk.mk



my_module_tags := $(LOCAL_MODULE_TAGS)
@@ -166,7 +176,7 @@ my_module_relative_path := $(strip $(LOCAL_MODULE_RELATIVE_PATH)) 
ifdef LOCAL_IS_HOST_MODULE

  partition_tag :=

else

ifeq (true,$(LOCAL_PROPRIETARY_MODULE))

ifeq (true,$(LOCAL_VENDOR_MODULE))

  partition_tag := _VENDOR

else ifeq (true,$(LOCAL_OEM_MODULE))

  partition_tag := _OEM

core/clear_vars.mk

+1 −0
Original line number Diff line number Diff line
@@ -226,6 +226,7 @@ LOCAL_UNINSTALLABLE_MODULE:= 
LOCAL_UNSTRIPPED_PATH:=

LOCAL_USE_AAPT2:=$(USE_AAPT2)

LOCAL_USE_VNDK:=

LOCAL_VENDOR_MODULE:=

LOCAL_VTSC_FLAGS:=

LOCAL_VTS_INCLUDES:=

LOCAL_WARNINGS_ENABLE:=

core/dex_preopt_odex_install.mk

+1 −1
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ DEXPREOPT.$(LOCAL_MODULE).DEX_PREOPT := $(LOCAL_DEX_PREOPT) 
DEXPREOPT.$(LOCAL_MODULE).MULTILIB := $(LOCAL_MULTILIB)

DEXPREOPT.$(LOCAL_MODULE).DEX_PREOPT_FLAGS := $(LOCAL_DEX_PREOPT_FLAGS)

DEXPREOPT.$(LOCAL_MODULE).PRIVILEGED_MODULE := $(LOCAL_PRIVILEGED_MODULE)

DEXPREOPT.$(LOCAL_MODULE).PROPRIETARY_MODULE := $(LOCAL_PROPRIETARY_MODULE)

DEXPREOPT.$(LOCAL_MODULE).VENDOR_MODULE := $(LOCAL_VENDOR_MODULE)

DEXPREOPT.$(LOCAL_MODULE).TARGET_ARCH := $(LOCAL_MODULE_TARGET_ARCH)

DEXPREOPT.$(LOCAL_MODULE).INSTALLED := $(installed_odex)

DEXPREOPT.$(LOCAL_MODULE).INSTALLED_STRIPPED := $(LOCAL_INSTALLED_MODULE)

core/local_vndk.mk

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
#If LOCAL_SDK_VERSION is set, thats a more restrictive set, so they dont need LOCAL_USE_VNDK

ifndef LOCAL_IS_HOST_MODULE

ifndef LOCAL_SDK_VERSION

  ifneq (,$(filter true,$(LOCAL_PROPRIETARY_MODULE) $(LOCAL_ODM_MODULE) $(LOCAL_OEM_MODULE)))

  ifneq (,$(filter true,$(LOCAL_VENDOR_MODULE) $(LOCAL_ODM_MODULE) $(LOCAL_OEM_MODULE)))

    LOCAL_USE_VNDK:=true

  else

    ifneq (,$(filter $(TARGET_OUT_VENDOR)%,$(LOCAL_MODULE_PATH) $(LOCAL_MODULE_PATH_32) $(LOCAL_MODULE_PATH_64)))