tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Statements in build system such as ifeq (true,$(LOCAL_VENDOR_MODULE)) has a poor compatibility

Browse source 
We have developed a vendor module and set LOCAL_VENDOR_MODULE := true<space> (Added a space character at the end)
The android build system then can't installed it in the right partition until we removed the extra space character.

bug: 129725067

Change-Id: I081ffe7f39a9c850007ba304c815436500be694c
This commit is contained in:
joker.yang 2019-04-03 09:10:37 +08:00 committed by joker yang
parent 482e67f4ee
commit a75c9a5079
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
core/base_rules.mk
View file

@ -224,15 +224,15 @@ my_module_relative_path := $(strip $(LOCAL_MODULE_RELATIVE_PATH))
ifdef LOCAL_IS_HOST_MODULE ifdef LOCAL_IS_HOST_MODULE
partition_tag := partition_tag :=
else else
ifeq (true,$(LOCAL_VENDOR_MODULE)) ifeq (true,$(strip $(LOCAL_VENDOR_MODULE)))
partition_tag := _VENDOR partition_tag := _VENDOR
else ifeq (true,$(LOCAL_OEM_MODULE)) else ifeq (true,$(strip $(LOCAL_OEM_MODULE)))
partition_tag := _OEM partition_tag := _OEM
else ifeq (true,$(LOCAL_ODM_MODULE)) else ifeq (true,$(strip $(LOCAL_ODM_MODULE)))
partition_tag := _ODM partition_tag := _ODM
else ifeq (true,$(LOCAL_PRODUCT_MODULE)) else ifeq (true,$(strip $(LOCAL_PRODUCT_MODULE)))
partition_tag := _PRODUCT partition_tag := _PRODUCT
else ifeq (true,$(LOCAL_PRODUCT_SERVICES_MODULE)) else ifeq (true,$(strip $(LOCAL_PRODUCT_SERVICES_MODULE)))
partition_tag := _PRODUCT_SERVICES partition_tag := _PRODUCT_SERVICES
else ifeq (NATIVE_TESTS,$(LOCAL_MODULE_CLASS)) else ifeq (NATIVE_TESTS,$(LOCAL_MODULE_CLASS))
partition_tag := _DATA partition_tag := _DATA

6
core/build_rro_package.mk
View file

@ -16,11 +16,11 @@ ifneq ($(LOCAL_SRC_FILES),)
endif endif
partition := partition :=
ifeq ($(LOCAL_ODM_MODULE),true) ifeq ($(strip $(LOCAL_ODM_MODULE)),true)
partition := $(TARGET_OUT_ODM) partition := $(TARGET_OUT_ODM)
else ifeq ($(LOCAL_VENDOR_MODULE),true) else ifeq ($(strip $(LOCAL_VENDOR_MODULE)),true)
partition := $(TARGET_OUT_VENDOR) partition := $(TARGET_OUT_VENDOR)
else ifeq ($(LOCAL_PRODUCT_SERVICES_MODULE),true) else ifeq ($(strip $(LOCAL_PRODUCT_SERVICES_MODULE)),true)
partition := $(TARGET_OUT_PRODUCT_SERVICES) partition := $(TARGET_OUT_PRODUCT_SERVICES)
else else
partition := $(TARGET_OUT_PRODUCT) partition := $(TARGET_OUT_PRODUCT)