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

Commit f9af5fa6 authored by Jaekyun Seok's avatar Jaekyun Seok
Browse files

Install (vendor|system/vendor)/build.prop always 

For now, vendor build properties are added into /system/build.prop
when property split isn't enabled.
So we have the duplicate codes to add them to /system/build.prop and
/vendor/build.prop case by case.

But either /vendor/build.prop or /system/vendor/build.prop can exist
always.
So this CL will install $(TARGET_OUT_VENDOR)/build.prop always and
remove the duplication.

Bug: 68115808
Test: tested on aosp_x86-userdebug
Change-Id: Ic734418890629d011c733c2d8d14739275e64a78
parent 63fc0e68

core/Makefile

+2 −18
Original line number Diff line number Diff line
@@ -275,7 +275,7 @@ system_prop_file := $(TARGET_SYSTEM_PROP) 
else

system_prop_file := $(wildcard $(TARGET_DEVICE_DIR)/system.prop)

endif

$(intermediate_system_build_prop): $(VENDOR_BUILDINFO_SH) $(BUILDINFO_SH) $(INTERNAL_BUILD_ID_MAKEFILE) $(BUILD_SYSTEM)/version_defaults.mk $(system_prop_file) $(INSTALLED_ANDROID_INFO_TXT_TARGET)

$(intermediate_system_build_prop): $(BUILDINFO_SH) $(INTERNAL_BUILD_ID_MAKEFILE) $(BUILD_SYSTEM)/version_defaults.mk $(system_prop_file) $(INSTALLED_ANDROID_INFO_TXT_TARGET)

	@echo Target buildinfo: $@

	@mkdir -p $(dir $@)

	$(hide) echo > $@
@@ -319,16 +319,6 @@ endif 
			TARGET_CPU_ABI2="$(TARGET_CPU_ABI2)" \

			TARGET_AAPT_CHARACTERISTICS="$(TARGET_AAPT_CHARACTERISTICS)" \

	        bash $(BUILDINFO_SH) >> $@

ifndef property_overrides_split_enabled

	$(hide) TARGET_DEVICE="$(TARGET_DEVICE)" \

			PRODUCT_NAME="$(TARGET_PRODUCT)" \

			PRODUCT_BRAND="$(PRODUCT_BRAND)" \

			PRODUCT_MODEL="$(PRODUCT_MODEL)" \

			PRODUCT_MANUFACTURER="$(PRODUCT_MANUFACTURER)" \

			TARGET_BOOTLOADER_BOARD_NAME="$(TARGET_BOOTLOADER_BOARD_NAME)" \

			TARGET_BOARD_PLATFORM="$(TARGET_BOARD_PLATFORM)" \

	        bash $(VENDOR_BUILDINFO_SH) >> $@

endif

	$(hide) $(foreach file,$(system_prop_file), \

		if [ -f "$(file)" ]; then \

			echo "#" >> $@; \
@@ -357,11 +347,7 @@ endif 


$(INSTALLED_BUILD_PROP_TARGET): $(intermediate_system_build_prop) $(INSTALLED_RECOVERYIMAGE_TARGET)

	@echo "Target build info: $@"

ifdef BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE

	$(hide) grep -v 'ro.product.first_api_level' $(intermediate_system_build_prop) > $@

else

	$(hide) cat $(intermediate_system_build_prop) > $@

endif

ifdef INSTALLED_RECOVERYIMAGE_TARGET

	$(hide) echo ro.expect.recovery_id=`cat $(RECOVERYIMAGE_ID_FILE)` >> $@

endif
@@ -370,7 +356,6 @@ endif 
# vendor build.prop

#

# For verifying that the vendor build is what we think it is

ifdef BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE

INSTALLED_VENDOR_BUILD_PROP_TARGET := $(TARGET_OUT_VENDOR)/build.prop

ALL_DEFAULT_INSTALLED_MODULES += $(INSTALLED_VENDOR_BUILD_PROP_TARGET)
@@ -389,7 +374,6 @@ $(INSTALLED_VENDOR_BUILD_PROP_TARGET): $(VENDOR_BUILDINFO_SH) $(intermediate_sys 
	$(hide) echo ro.vendor.build.date=`$(DATE_FROM_FILE)`>>$@

	$(hide) echo ro.vendor.build.date.utc=`$(DATE_FROM_FILE) +%s`>>$@

	$(hide) echo ro.vendor.build.fingerprint="$(BUILD_FINGERPRINT_FROM_FILE)">>$@

ifdef property_overrides_split_enabled

	$(hide) TARGET_DEVICE="$(TARGET_DEVICE)" \

			PRODUCT_NAME="$(TARGET_PRODUCT)" \

			PRODUCT_BRAND="$(PRODUCT_BRAND)" \
@@ -398,6 +382,7 @@ ifdef property_overrides_split_enabled 
			TARGET_BOOTLOADER_BOARD_NAME="$(TARGET_BOOTLOADER_BOARD_NAME)" \

			TARGET_BOARD_PLATFORM="$(TARGET_BOARD_PLATFORM)" \

	        bash $(VENDOR_BUILDINFO_SH) >> $@

ifdef property_overrides_split_enabled

	$(hide) echo "#" >> $@; \

	        echo "# ADDITIONAL VENDOR BUILD PROPERTIES" >> $@; \

	        echo "#" >> $@;
@@ -405,7 +390,6 @@ ifdef property_overrides_split_enabled 
		echo "$(line)" >> $@;)

	$(hide) build/tools/post_process_props.py $@

endif  # property_overrides_split_enabled

endif  # BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE



# ----------------------------------------------------------------