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

Commit aaf50f6a authored by Inseob Kim's avatar Inseob Kim Committed by Gerrit Code Review
Browse files

Revert "Revert "Revert^2 "Add more variables for system/build.pr..." 

Revert submission 3195812-revert-3195644-revert-3195637-revert-3184480-system_build_prop_soong-BZIDUTEOOC-KRUETCBWUR-TUHZPHUVFJ

Reason for revert: fixed with aosp/3196490 and aosp/3196470

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

Change-Id: Id2da52a73f9791b3049c3fe60727bfb383180f14
parent 9a046515

core/config.mk

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

+2 −0
Original line number Original line Diff line number Diff line
@@ -340,6 +340,8 @@ $(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

+2 −0
Original line number Original line Diff line number Diff line
@@ -93,6 +93,8 @@ $(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

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