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

Commit dd3d5c1f authored by Liana Kazanova's avatar Liana Kazanova
Browse files

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
parent 0b2f48f0

core/config.mk

+0 −6
Original line number Diff line number Diff line
@@ -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

core/soong_config.mk

+0 −2
Original line number 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, 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),)

core/soong_extra_config.mk

+0 −2
Original line number Diff line number Diff line
@@ -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)))

core/sysprop.mk

+4 −0
Original line number Diff line number Diff line
@@ -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) \