From dd3d5c1f3d7161f8ac6036141c4c0216da77718a Mon Sep 17 00:00:00 2001 From: Liana Kazanova Date: Tue, 30 Jul 2024 19:14:30 +0000 Subject: [PATCH] Revert "Revert "Revert "Revert^2 "Add more variables for system/..." Revert submission 3196490-revert-3195812-revert-3195644-revert-3195637-revert-3184480-system_build_prop_soong-BZIDUTEOOC-KRUETCBWUR-TUHZPHUVFJ-XYILSUPUOA Reason for revert: DroidMonitor: Potential culprit for b/356297315 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted. Reverted changes: /q/submissionid:3196490-revert-3195812-revert-3195644-revert-3195637-revert-3184480-system_build_prop_soong-BZIDUTEOOC-KRUETCBWUR-TUHZPHUVFJ-XYILSUPUOA Change-Id: Ic1c52133c80484b318f1ae72e2fd5b5fe199f9ab --- core/config.mk | 6 ------ core/soong_config.mk | 2 -- core/soong_extra_config.mk | 2 -- core/sysprop.mk | 4 ++++ 4 files changed, 4 insertions(+), 10 deletions(-) diff --git a/core/config.mk b/core/config.mk index 0c8a87f678..ae659441de 100644 --- a/core/config.mk +++ b/core/config.mk @@ -1246,12 +1246,6 @@ BUILD_WARNING_BAD_OPTIONAL_USES_LIBS_ALLOWLIST := LegacyCamera Gallery2 # 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 09ee938f73..1d35337a2f 100644 --- a/core/soong_config.mk +++ b/core/soong_config.mk @@ -340,8 +340,6 @@ $(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)) - # 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 76da0d702b..82d1b158b3 100644 --- a/core/soong_extra_config.mk +++ b/core/soong_extra_config.mk @@ -88,8 +88,6 @@ $(call add_json_str, VendorImageFileSystemType, $(BOARD_VENDORIMAGE_FILE_SYSTEM_ $(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 615025de13..47d8a41a38 100644 --- a/core/sysprop.mk +++ b/core/sysprop.mk @@ -231,7 +231,11 @@ KNOWN_OEM_THUMBPRINT_PROPERTIES:= 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) \