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

Commit d98ff7cc authored by Inseob Kim's avatar Inseob Kim
Browse files

Add build_prop soong module 

build_prop is a soong module generating {partition}/build.prop. It's
ported from build/make/core/sysprop.mk and will replace sysprop.mk in
the future. Currently used only by Android.bp cuttlefish system image.

Bug: 322090587
Bug: 346214958
Test: compare system/build.prop and aosp_cf_x86_64_system-build.prop for
      eng / user / userdebug
Change-Id: Iadb793a049b7be15b36f948c3a473105db3835a1
parent 15961c85

core/soong_config.mk

+2 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ $(call json_start) 
$(call add_json_str,  Make_suffix, -$(TARGET_PRODUCT))



$(call add_json_str,  BuildId,                           $(BUILD_ID))

$(call add_json_str,  BuildFingerprintFile,              build_fingerprint.txt)

$(call add_json_str,  BuildNumberFile,                   build_number.txt)

$(call add_json_str,  BuildHostnameFile,                 build_hostname.txt)

$(call add_json_str,  BuildThumbprintFile,               build_thumbprint.txt)
@@ -296,6 +297,7 @@ $(call add_json_bool, BuildBrokenVendorPropertyNamespace, $(filter true,$(BUILD 
$(call add_json_bool, BuildBrokenIncorrectPartitionImages, $(filter true,$(BUILD_BROKEN_INCORRECT_PARTITION_IMAGES)))

$(call add_json_list, BuildBrokenInputDirModules,          $(BUILD_BROKEN_INPUT_DIR_MODULES))

$(call add_json_bool, BuildBrokenDontCheckSystemSdk,       $(filter true,$(BUILD_BROKEN_DONT_CHECK_SYSTEMSDK)))

$(call add_json_bool, BuildBrokenDupSysprop,               $(filter true,$(BUILD_BROKEN_DUP_SYSPROP)))



$(call add_json_list, BuildWarningBadOptionalUsesLibsAllowlist,    $(BUILD_WARNING_BAD_OPTIONAL_USES_LIBS_ALLOWLIST))

core/soong_extra_config.mk

+9 −11
Original line number Diff line number Diff line 
$(call json_start)



$(call add_json_str, BuildFingerprintFile,              build_fingerprint.txt)

$(call add_json_str, DeviceCpuVariantRuntime,           $(TARGET_CPU_VARIANT_RUNTIME))

$(call add_json_str, DeviceAbiList,                     $(TARGET_CPU_ABI_LIST))

$(call add_json_str, DeviceAbiList32,                   $(TARGET_CPU_ABI_LIST_32_BIT))
@@ -17,8 +16,6 @@ $(call add_json_str, BoardShippingApiLevel, $(BOARD_SHIPPING_API_LEVEL)) 
$(call add_json_str, ShippingApiLevel,       $(PRODUCT_SHIPPING_API_LEVEL))

$(call add_json_str, ShippingVendorApiLevel, $(PRODUCT_SHIPPING_VENDOR_API_LEVEL))



$(call add_json_bool,BuildBrokenDupSysprop, $(filter true,$(BUILD_BROKEN_DUP_SYSPROP)))



$(call add_json_str, ProductModel,                      $(PRODUCT_MODEL))

$(call add_json_str, ProductModelForAttestation,        $(PRODUCT_MODEL_FOR_ATTESTATION))

$(call add_json_str, ProductBrandForAttestation,        $(PRODUCT_BRAND_FOR_ATTESTATION))
@@ -39,17 +36,18 @@ define collapse-prop-pairs 
$(subst ",,$(call collapse-pairs,$(call collapse-pairs,$$($(1)),?=),=))

endef



$(call add_json_list, SystemProperties,        $(call collapse-prop-pairs,PRODUCT_SYSTEM_PROPERTIES))

$(call add_json_list, SystemDefaultProperties, $(call collapse-prop-pairs,PRODUCT_SYSTEM_DEFAULT_PROPERTIES))

$(call add_json_list, SystemExtProperties,     $(call collapse-prop-pairs,PRODUCT_SYSTEM_EXT_PROPERTIES))

$(call add_json_list, VendorProperties,        $(call collapse-prop-pairs,PRODUCT_VENDOR_PROPERTIES))

$(call add_json_list, ProductProperties,       $(call collapse-prop-pairs,PRODUCT_PRODUCT_PROPERTIES))

$(call add_json_list, OdmProperties,           $(call collapse-prop-pairs,PRODUCT_ODM_PROPERTIES))

$(call add_json_list, OemProperties,           $(call collapse-prop-pairs,PRODUCT_OEM_PROPERTIES))

$(call add_json_list, PropertyOverrides,       $(call collapse-prop-pairs,PRODUCT_PROPERTY_OVERRIDES))

$(call add_json_list, PRODUCT_SYSTEM_PROPERTIES,         $(call collapse-prop-pairs,PRODUCT_SYSTEM_PROPERTIES))

$(call add_json_list, PRODUCT_SYSTEM_DEFAULT_PROPERTIES, $(call collapse-prop-pairs,PRODUCT_SYSTEM_DEFAULT_PROPERTIES))

$(call add_json_list, PRODUCT_SYSTEM_EXT_PROPERTIES,     $(call collapse-prop-pairs,PRODUCT_SYSTEM_EXT_PROPERTIES))

$(call add_json_list, PRODUCT_VENDOR_PROPERTIES,         $(call collapse-prop-pairs,PRODUCT_VENDOR_PROPERTIES))

$(call add_json_list, PRODUCT_PRODUCT_PROPERTIES,        $(call collapse-prop-pairs,PRODUCT_PRODUCT_PROPERTIES))

$(call add_json_list, PRODUCT_ODM_PROPERTIES,            $(call collapse-prop-pairs,PRODUCT_ODM_PROPERTIES))

$(call add_json_list, PRODUCT_PROPERTY_OVERRIDES,        $(call collapse-prop-pairs,PRODUCT_PROPERTY_OVERRIDES))



$(call add_json_str, BootloaderBoardName, $(TARGET_BOOTLOADER_BOARD_NAME))



$(call add_json_bool, SdkBuild, $(filter sdk sdk_addon,$(MAKECMDGOALS)))



_config_enable_uffd_gc := \

  $(firstword $(OVERRIDE_ENABLE_UFFD_GC) $(PRODUCT_ENABLE_UFFD_GC) default)

$(call add_json_str, EnableUffdGc, $(_config_enable_uffd_gc))