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

Commit 680a116c authored by joker.yang's avatar joker.yang Committed by android-build-merger
Browse files

Merge "Statements in build system such as ifeq (true,$(LOCAL_VENDOR_MODULE))... 

Merge "Statements in build system such as ifeq (true,$(LOCAL_VENDOR_MODULE)) has a poor compatibility" am: 78ec5997
am: 0e2559c2

Change-Id: I4e1f9781f903b4d3ef55b30b087c89126bc09db6
parents ce2754f5 0e2559c2

core/base_rules.mk

+5 −5
Original line number Diff line number Diff line
@@ -224,15 +224,15 @@ my_module_relative_path := $(strip $(LOCAL_MODULE_RELATIVE_PATH)) 
ifdef LOCAL_IS_HOST_MODULE

  partition_tag :=

else

ifeq (true,$(LOCAL_VENDOR_MODULE))

ifeq (true,$(strip $(LOCAL_VENDOR_MODULE)))

  partition_tag := _VENDOR

else ifeq (true,$(LOCAL_OEM_MODULE))

else ifeq (true,$(strip $(LOCAL_OEM_MODULE)))

  partition_tag := _OEM

else ifeq (true,$(LOCAL_ODM_MODULE))

else ifeq (true,$(strip $(LOCAL_ODM_MODULE)))

  partition_tag := _ODM

else ifeq (true,$(LOCAL_PRODUCT_MODULE))

else ifeq (true,$(strip $(LOCAL_PRODUCT_MODULE)))

  partition_tag := _PRODUCT

else ifeq (true,$(LOCAL_PRODUCT_SERVICES_MODULE))

else ifeq (true,$(strip $(LOCAL_PRODUCT_SERVICES_MODULE)))

  partition_tag := _PRODUCT_SERVICES

else ifeq (NATIVE_TESTS,$(LOCAL_MODULE_CLASS))

  partition_tag := _DATA

core/build_rro_package.mk

+3 −3
Original line number Diff line number Diff line
@@ -16,11 +16,11 @@ ifneq ($(LOCAL_SRC_FILES),) 
endif



partition :=

ifeq ($(LOCAL_ODM_MODULE),true)

ifeq ($(strip $(LOCAL_ODM_MODULE)),true)

  partition := $(TARGET_OUT_ODM)

else ifeq ($(LOCAL_VENDOR_MODULE),true)

else ifeq ($(strip $(LOCAL_VENDOR_MODULE)),true)

  partition := $(TARGET_OUT_VENDOR)

else ifeq ($(LOCAL_PRODUCT_SERVICES_MODULE),true)

else ifeq ($(strip $(LOCAL_PRODUCT_SERVICES_MODULE)),true)

  partition := $(TARGET_OUT_PRODUCT_SERVICES)

else

  partition := $(TARGET_OUT_PRODUCT)