StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add a way to override LOCAL_PRODUCT_MODULE."

Browse Source
This commit is contained in:
Dario Freni
2018-08-16 21:50:03 +00:00
committed by Gerrit Code Review
parent 7911fd3b91 f31bc450d2
commit 81ad1ef95c
3 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/base_rules.mk
View File

@@ -66,6 +66,12 @@ else
my_host_cross := my_host_cross :=
endif endif
ifeq (true, $(LOCAL_PRODUCT_MODULE))
ifneq (,$(filter $(LOCAL_MODULE),$(PRODUCT_FORCE_PRODUCT_MODULES_TO_SYSTEM_PARTITION)))
LOCAL_PRODUCT_MODULE :=
endif
endif
_path := $(LOCAL_MODULE_PATH) $(LOCAL_MODULE_PATH_32) $(LOCAL_MODULE_PATH_64) _path := $(LOCAL_MODULE_PATH) $(LOCAL_MODULE_PATH_32) $(LOCAL_MODULE_PATH_64)
ifneq ($(filter $(TARGET_OUT_VENDOR)%,$(_path)),) ifneq ($(filter $(TARGET_OUT_VENDOR)%,$(_path)),)
LOCAL_VENDOR_MODULE := true LOCAL_VENDOR_MODULE := true

1
core/product.mk
View File

@@ -209,6 +209,7 @@ _product_var_list := \
PRODUCT_USE_DYNAMIC_PARTITION_SIZE \ PRODUCT_USE_DYNAMIC_PARTITION_SIZE \
PRODUCT_BUILD_SUPER_PARTITION \ PRODUCT_BUILD_SUPER_PARTITION \
PRODUCT_USE_FASTBOOTD \ PRODUCT_USE_FASTBOOTD \
PRODUCT_FORCE_PRODUCT_MODULES_TO_SYSTEM_PARTITION \
define dump-product define dump-product
$(info ==== $(1) ====)\ $(info ==== $(1) ====)\

6
core/product_config.mk
View File

@@ -534,3 +534,9 @@ PRODUCT_USE_FASTBOOTD := $(or \
$(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_USE_FASTBOOTD)),\ $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_USE_FASTBOOTD)),\
$(PRODUCT_USE_LOGICAL_PARTITIONS)) $(PRODUCT_USE_LOGICAL_PARTITIONS))
.KATI_READONLY := PRODUCT_USE_FASTBOOTD .KATI_READONLY := PRODUCT_USE_FASTBOOTD
# List of modules that should be forcefully unmarked from being LOCAL_PRODUCT_MODULE, and hence
# installed on /system directory by default.
PRODUCT_FORCE_PRODUCT_MODULES_TO_SYSTEM_PARTITION := \
$(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_FORCE_PRODUCT_MODULES_TO_SYSTEM_PARTITION))
.KATI_READONLY := PRODUCT_FORCE_PRODUCT_MODULES_TO_SYSTEM_PARTITION