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

Commit 90531960 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Build system_ext build.prop with Soong" into main

parents c60b50c2 6dbd7eb6

core/config.mk

+5 −1
Original line number Diff line number Diff line
@@ -1250,7 +1250,11 @@ ifeq ($(TARGET_SYSTEM_PROP),) 
TARGET_SYSTEM_PROP := $(wildcard $(TARGET_DEVICE_DIR)/system.prop)

endif



.KATI_READONLY += TARGET_SYSTEM_PROP

ifeq ($(TARGET_SYSTEM_EXT_PROP),)

TARGET_SYSTEM_EXT_PROP := $(wildcard $(TARGET_DEVICE_DIR)/system_ext.prop)

endif



.KATI_READONLY += TARGET_SYSTEM_PROP TARGET_SYSTEM_EXT_PROP



include $(BUILD_SYSTEM)/sysprop_config.mk

core/soong_config.mk

+1 −0
Original line number Diff line number Diff line
@@ -341,6 +341,7 @@ $(call add_json_bool, BoardUseVbmetaDigestInFingerprint, $(filter true,$(BOARD_U 
$(call add_json_list, OemProperties, $(PRODUCT_OEM_PROPERTIES))



$(call add_json_list, SystemPropFiles, $(TARGET_SYSTEM_PROP))

$(call add_json_list, SystemExtPropFiles, $(TARGET_SYSTEM_EXT_PROP))



# Do not set ArtTargetIncludeDebugBuild into any value if PRODUCT_ART_TARGET_INCLUDE_DEBUG_BUILD is not set,

# to have the same behavior from runtime_libart.mk.

core/sysprop.mk

+2 −17
Original line number Diff line number Diff line
@@ -395,25 +395,10 @@ $(eval $(call declare-1p-target,$(INSTALLED_SYSTEM_DLKM_BUILD_PROP_TARGET))) 
# -----------------------------------------------------------------

# system_ext/etc/build.prop

#

_prop_files_ := $(if $(TARGET_SYSTEM_EXT_PROP),\

    $(TARGET_SYSTEM_EXT_PROP),\

    $(wildcard $(TARGET_DEVICE_DIR)/system_ext.prop))



# Order matters here. When there are duplicates, the last one wins.

# TODO(b/117892318): don't allow duplicates so that the ordering doesn't matter

_prop_vars_ := PRODUCT_SYSTEM_EXT_PROPERTIES

# system_ext/build.prop is built by Soong. See system-build.prop module in

# build/soong/Android.bp.



INSTALLED_SYSTEM_EXT_BUILD_PROP_TARGET := $(TARGET_OUT_SYSTEM_EXT)/etc/build.prop

$(eval $(call build-properties,\

    system_ext,\

    $(INSTALLED_SYSTEM_EXT_BUILD_PROP_TARGET),\

    $(_prop_files_),\

    $(_prop_vars_),\

    $(empty),\

    $(empty),\

    $(empty)))



$(eval $(call declare-1p-target,$(INSTALLED_SYSTEM_EXT_BUILD_PROP_TARGET)))



# ----------------------------------------------------------------

# ramdisk/boot/etc/build.prop

target/product/base_system_ext.mk

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ PRODUCT_PACKAGES += \ 
    SatelliteClient \

    selinux_policy_system_ext \

    system_ext_manifest.xml \

    system_ext-build.prop \



# Base modules when shipping api level is less than or equal to 34

PRODUCT_PACKAGES_SHIPPING_API_LEVEL_34 += \