Revert "Revert^2 "Add more variables for system/build.prop migra..."
Revert submission 3195644-revert-3195637-revert-3184480-system_build_prop_soong-BZIDUTEOOC-KRUETCBWUR
Reason for revert: Droidmonitor created revert due to b/355379515. Will be verifying through ABTD before submission.
Reverted changes: /q/submissionid:3195644-revert-3195637-revert-3184480-system_build_prop_soong-BZIDUTEOOC-KRUETCBWUR
Change-Id: Idaad375a3a34252b85169ee37ac97f1b02670cea
diff --git a/core/config.mk b/core/config.mk
index 0c8a87f..ae65944 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -1246,12 +1246,6 @@
# in the source tree.
dont_bother_goals := out product-graph
-ifeq ($(TARGET_SYSTEM_PROP),)
-TARGET_SYSTEM_PROP := $(wildcard $(TARGET_DEVICE_DIR)/system.prop)
-endif
-
-.KATI_READONLY += TARGET_SYSTEM_PROP
-
include $(BUILD_SYSTEM)/sysprop_config.mk
# Make ANDROID Soong config variables visible to Android.mk files, for
diff --git a/core/soong_config.mk b/core/soong_config.mk
index ab29a61..72ee2e4 100644
--- a/core/soong_config.mk
+++ b/core/soong_config.mk
@@ -340,8 +340,6 @@
$(call add_json_list, OemProperties, $(PRODUCT_OEM_PROPERTIES))
-$(call add_json_list, SystemPropFiles, $(TARGET_SYSTEM_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.
ifneq ($(PRODUCT_ART_TARGET_INCLUDE_DEBUG_BUILD),)
diff --git a/core/soong_extra_config.mk b/core/soong_extra_config.mk
index 2df721f..e4432d2 100644
--- a/core/soong_extra_config.mk
+++ b/core/soong_extra_config.mk
@@ -93,8 +93,6 @@
$(call add_json_list, BuildVersionTags, $(BUILD_VERSION_TAGS))
-$(call add_json_bool, ProductNotDebuggableInUserdebug, $(PRODUCT_NOT_DEBUGGABLE_IN_USERDEBUG))
-
$(call json_end)
$(shell mkdir -p $(dir $(SOONG_EXTRA_VARIABLES)))
diff --git a/core/sysprop.mk b/core/sysprop.mk
index 615025d..47d8a41 100644
--- a/core/sysprop.mk
+++ b/core/sysprop.mk
@@ -231,7 +231,11 @@
buildinfo_prop := $(call intermediates-dir-for,ETC,buildinfo.prop)/buildinfo.prop
+ifdef TARGET_SYSTEM_PROP
system_prop_file := $(TARGET_SYSTEM_PROP)
+else
+system_prop_file := $(wildcard $(TARGET_DEVICE_DIR)/system.prop)
+endif
_prop_files_ := \
$(buildinfo_prop) \