Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9a046515 authored Jul 25, 2024 by Pechetty Sravani (xWF)

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

parent 70e8a123

core/config.mk

+0 −6

Original line number	Original line	Diff line number	Diff line
	@@ -1246,12 +1246,6 @@ BUILD_WARNING_BAD_OPTIONAL_USES_LIBS_ALLOWLIST := LegacyCamera Gallery2
	# in the source tree.		# in the source tree.
	dont_bother_goals := out product-graph		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		include $(BUILD_SYSTEM)/sysprop_config.mk

	# Make ANDROID Soong config variables visible to Android.mk files, for		# Make ANDROID Soong config variables visible to Android.mk files, for

core/soong_config.mk

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -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, 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,		# 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.
	ifneq ($(PRODUCT_ART_TARGET_INCLUDE_DEBUG_BUILD),)		ifneq ($(PRODUCT_ART_TARGET_INCLUDE_DEBUG_BUILD),)

core/soong_extra_config.mk

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -93,8 +93,6 @@ $(call add_json_str, VendorImageFileSystemType, $(BOARD_VENDORIMAGE_FILE_SYSTEM_

	$(call add_json_list, BuildVersionTags, $(BUILD_VERSION_TAGS))		$(call add_json_list, BuildVersionTags, $(BUILD_VERSION_TAGS))

	$(call add_json_bool, ProductNotDebuggableInUserdebug, $(PRODUCT_NOT_DEBUGGABLE_IN_USERDEBUG))

	$(call json_end)		$(call json_end)

	$(shell mkdir -p $(dir $(SOONG_EXTRA_VARIABLES)))		$(shell mkdir -p $(dir $(SOONG_EXTRA_VARIABLES)))

core/sysprop.mk

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -231,7 +231,11 @@ KNOWN_OEM_THUMBPRINT_PROPERTIES:=

	buildinfo_prop := $(call intermediates-dir-for,ETC,buildinfo.prop)/buildinfo.prop		buildinfo_prop := $(call intermediates-dir-for,ETC,buildinfo.prop)/buildinfo.prop

			ifdef TARGET_SYSTEM_PROP
	system_prop_file := $(TARGET_SYSTEM_PROP)		system_prop_file := $(TARGET_SYSTEM_PROP)
			else
			system_prop_file := $(wildcard $(TARGET_DEVICE_DIR)/system.prop)
			endif

	_prop_files_ := \		_prop_files_ := \
	$(buildinfo_prop) \		$(buildinfo_prop) \