StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Revert "Revert "Revert "Revert^2 "Add more variables for..." am: 774a6dbbe8 am: 57ff7bdd84

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/3201035

Change-Id: Ia877ab3a01e9c09401ec2be381500fde3ab3eb46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Inseob Kim
2024-08-01 00:23:58 +00:00
committed by Automerger Merge Worker
parent c9de9b5ee9 57ff7bdd84
commit f98215c6cb
4 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/config.mk
View File

@@ -1251,6 +1251,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

2
core/soong_config.mk
View File

@@ -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),)

2
core/soong_extra_config.mk
View File

@@ -88,6 +88,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)))

4
core/sysprop.mk
View File

@@ -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) \