commit 71642e8b2c6a96904d820590d947e6a10740fc9d
author Inseob Kim <inseob@google.com> Wed Jul 31 02:00:41 2024 +0000
committer micky387 <mickaelsaibi@free.fr> Sat Nov 09 17:26:51 2024 -0500
tree 30bb53ba16890287b5b6706408afa75ed7a29598
parent c2b171d3a2572548ed8bb7623df2e58a568f149f

Revert "Revert "Revert "Revert "Revert^2 "Add more variables for..."

Revert submission 3200273-revert-3196490-revert-3195812-revert-3195644-revert-3195637-revert-3184480-system_build_prop_soong-BZIDUTEOOC-KRUETCBWUR-TUHZPHUVFJ-XYILSUPUOA-PCKYAVELZP

Reason for revert: fixed breakage with aosp/3200730, verified with ABTD

Reverted changes: /q/submissionid:3200273-revert-3196490-revert-3195812-revert-3195644-revert-3195637-revert-3184480-system_build_prop_soong-BZIDUTEOOC-KRUETCBWUR-TUHZPHUVFJ-XYILSUPUOA-PCKYAVELZP

Change-Id: I19163de97c397b9c171362d221389a1d66a5712a

core/config.mk

diff --git a/core/config.mk b/core/config.mk
index d957356..75e072c 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -1247,6 +1247,12 @@
 # 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