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

Build system_ext build.prop with Soong

Browse source 
Bug: 322090587
Test: build and compare system_ext/etc/build.prop
Change-Id: I7b1af2e2b1fe7f107e1540d7b797c7bf489b8a0d
This commit is contained in:
Inseob Kim 2024-08-05 12:50:01 +09:00 committed by Bartłomiej Rudecki
parent 4d8f8c5906
commit 65b9ee2040
Signed by: przekichane
GPG key ID: 751F23C6F014EF76
4 changed files with 9 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/config.mk
View file

@ -1264,7 +1264,11 @@ ifeq ($(TARGET_SYSTEM_PROP),)
TARGET_SYSTEM_PROP := $(wildcard $(TARGET_DEVICE_DIR)/system.prop) TARGET_SYSTEM_PROP := $(wildcard $(TARGET_DEVICE_DIR)/system.prop)
endif 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 include $(BUILD_SYSTEM)/sysprop_config.mk

1
core/soong_config.mk
View file

@ -364,6 +364,7 @@ $(call add_json_bool, BoardUseVbmetaDigestInFingerprint, $(filter true,$(BOARD_U
$(call add_json_list, OemProperties, $(PRODUCT_OEM_PROPERTIES)) $(call add_json_list, OemProperties, $(PRODUCT_OEM_PROPERTIES))
$(call add_json_list, SystemPropFiles, $(TARGET_SYSTEM_PROP)) $(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, # 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. # to have the same behavior from runtime_libart.mk.

19
core/sysprop.mk
View file

@ -395,25 +395,10 @@ $(eval $(call declare-1p-target,$(INSTALLED_SYSTEM_DLKM_BUILD_PROP_TARGET)))
# ----------------------------------------------------------------- # -----------------------------------------------------------------
# system_ext/etc/build.prop # system_ext/etc/build.prop
# #
_prop_files_ := $(if $(TARGET_SYSTEM_EXT_PROP),\ # system_ext/build.prop is built by Soong. See system-build.prop module in
$(TARGET_SYSTEM_EXT_PROP),\ # build/soong/Android.bp.
$(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
INSTALLED_SYSTEM_EXT_BUILD_PROP_TARGET := $(TARGET_OUT_SYSTEM_EXT)/etc/build.prop 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 # ramdisk/boot/etc/build.prop

1
target/product/base_system_ext.mk
View file

@ -24,6 +24,7 @@ PRODUCT_PACKAGES += \
SatelliteClient \ SatelliteClient \
selinux_policy_system_ext \ selinux_policy_system_ext \
system_ext_manifest.xml \ system_ext_manifest.xml \
system_ext-build.prop \
# Base modules when shipping api level is less than or equal to 34 # Base modules when shipping api level is less than or equal to 34
PRODUCT_PACKAGES_SHIPPING_API_LEVEL_34 += \ PRODUCT_PACKAGES_SHIPPING_API_LEVEL_34 += \