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

Commit f31bc450 authored by Dario Freni's avatar Dario Freni
Browse files

Add a way to override LOCAL_PRODUCT_MODULE. 

This CL introduces the product variable
PRODUCT_FORCE_PRODUCT_MODULES_TO_SYSTEM_PARTITION, which can contain a
list of module names to be "unmarked" from being LOCAL_PRODUCT_MODULE.

If a module name is included in this variable and if that module is
declared as LOCAL_PRODUCT_MODULE, the setting will be overriden and the
module will be installed in /system. This is useful to control this
behavior on a device-specific level.

Test: m; and checked resulting output.
Bug: 110072687
Change-Id: Iaab663a7ed757c1dd4f16169b0ac3d71650014d2
parent 7911fd3b

core/base_rules.mk

+6 −0
Original line number Diff line number Diff line
@@ -66,6 +66,12 @@ else 
  my_host_cross :=

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)

ifneq ($(filter $(TARGET_OUT_VENDOR)%,$(_path)),)

LOCAL_VENDOR_MODULE := true

core/product.mk

+1 −0
Original line number Diff line number Diff line
@@ -209,6 +209,7 @@ _product_var_list := \ 
    PRODUCT_USE_DYNAMIC_PARTITION_SIZE \

    PRODUCT_BUILD_SUPER_PARTITION \

    PRODUCT_USE_FASTBOOTD \

    PRODUCT_FORCE_PRODUCT_MODULES_TO_SYSTEM_PARTITION \



define dump-product

$(info ==== $(1) ====)\

core/product_config.mk

+6 −0
Original line number Diff line number Diff line
@@ -534,3 +534,9 @@ PRODUCT_USE_FASTBOOTD := $(or \ 
    $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_USE_FASTBOOTD)),\

    $(PRODUCT_USE_LOGICAL_PARTITIONS))

.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