Build system_ext build.prop with Soong
Bug: 322090587
Test: build and compare system_ext/etc/build.prop
Change-Id: I7b1af2e2b1fe7f107e1540d7b797c7bf489b8a0d
diff --git a/core/sysprop.mk b/core/sysprop.mk
index 7dd756a..6d65e19 100644
--- a/core/sysprop.mk
+++ b/core/sysprop.mk
@@ -395,25 +395,10 @@
# -----------------------------------------------------------------
# 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