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

Commit c7f65d7c authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove /default.prop" am: 3528db55 

Change-Id: Iaf51cbea752f35c82500c0c0471e357ef2782826
parents 952dbfab 3528db55

core/Makefile

+6 −28
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ endif 
# -----------------------------------------------------------------

# FINAL_VENDOR_DEFAULT_PROPERTIES will be installed in vendor/build.prop if

# property_overrides_split_enabled is true. Otherwise it will be installed in

# /default.prop

# /system/build.prop

ifdef BOARD_VNDK_VERSION

  ifeq ($(BOARD_VNDK_VERSION),current)

    FINAL_VENDOR_DEFAULT_PROPERTIES := ro.vndk.version=$(PLATFORM_VNDK_VERSION)
@@ -254,39 +254,19 @@ define generate-common-build-props-with-product-vars-set 
	bash $(BUILDINFO_COMMON_SH) "$(1)" >> $(2)

endef



# Legacy (non-Treble) path

ifndef property_overrides_split_enabled

INSTALLED_LEGACY_DEFAULT_PROP_TARGET := $(TARGET_ROOT_OUT)/default.prop

ALL_DEFAULT_INSTALLED_MODULES += $(INSTALLED_LEGACY_DEFAULT_PROP_TARGET)



$(INSTALLED_LEGACY_DEFAULT_PROP_TARGET): $(BUILDINFO_COMMON_SH) $(POST_PROCESS_PROPS)

	@echo Target buildinfo: $@

	@mkdir -p $(dir $@)

	@rm -f $@

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

	        echo "# ADDITIONAL_DEFAULT_PROPERTIES" >> $@; \

	        echo "#" >> $@;

	$(hide) $(foreach line,$(call uniq-pairs-by-first-component, \

	            $(call collapse-pairs, $(ADDITIONAL_DEFAULT_PROPERTIES)) \

	            $(call collapse-pairs, $(PRODUCT_SYSTEM_DEFAULT_PROPERTIES)) \

	            $(call collapse-pairs, $(FINAL_VENDOR_DEFAULT_PROPERTIES)),=), \

	    echo "$(line)" >> $@;)

	$(hide) $(POST_PROCESS_PROPS) $@

endif



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

# build.prop

intermediate_system_build_prop := $(call intermediates-dir-for,ETC,system_build_prop)/build.prop

INSTALLED_BUILD_PROP_TARGET := $(TARGET_OUT)/build.prop

ALL_DEFAULT_INSTALLED_MODULES += $(INSTALLED_BUILD_PROP_TARGET)



# TODO(b/117892318) merge DEFAULT into BUILD

ifdef property_overrides_split_enabled

FINAL_DEFAULT_PROPERTIES := \

    $(call collapse-pairs, $(ADDITIONAL_DEFAULT_PROPERTIES)) \

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

FINAL_DEFAULT_PROPERTIES := $(call uniq-pairs-by-first-component, \

    $(FINAL_DEFAULT_PROPERTIES),=)

endif



FINAL_BUILD_PROPERTIES := \

    $(call collapse-pairs, $(ADDITIONAL_BUILD_PROPERTIES))

FINAL_BUILD_PROPERTIES := $(call uniq-pairs-by-first-component, \
@@ -400,9 +380,11 @@ $(intermediate_system_build_prop): $(BUILDINFO_SH) $(BUILDINFO_COMMON_SH) $(INTE 
	@echo Target buildinfo: $@

	@mkdir -p $(dir $@)

	$(hide) rm -f $@ && touch $@

ifdef property_overrides_split_enabled

	$(hide) $(foreach line,$(FINAL_DEFAULT_PROPERTIES), \

	    echo "$(line)" >> $@;)

ifndef property_overrides_split_enabled

	$(hide) $(foreach line,$(FINAL_VENDOR_DEFAULT_PROPERTIES), \

	    echo "$(line)" >> $@;)

endif

ifneq ($(PRODUCT_OEM_PROPERTIES),)

	$(hide) echo "#" >> $@; \
@@ -2091,7 +2073,6 @@ $(foreach prop,$(1), \ 
endef



$(INSTALLED_RECOVERY_BUILD_PROP_TARGET): \

	    $(INSTALLED_LEGACY_DEFAULT_PROP_TARGET) \

	    $(intermediate_system_build_prop) \

	    $(INSTALLED_VENDOR_BUILD_PROP_TARGET) \

	    $(INSTALLED_ODM_BUILD_PROP_TARGET) \
@@ -2100,9 +2081,6 @@ $(INSTALLED_RECOVERY_BUILD_PROP_TARGET): \ 
	@echo "Target recovery buildinfo: $@"

	$(hide) mkdir -p $(dir $@)

	$(hide) rm -f $@

ifneq (,$(INSTALLED_LEGACY_DEFAULT_PROP_TARGET))

	$(hide) cat $(INSTALLED_LEGACY_DEFAULT_PROP_TARGET) > $@

endif

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

	$(hide) cat $(INSTALLED_VENDOR_BUILD_PROP_TARGET) >> $@

	$(hide) cat $(INSTALLED_ODM_BUILD_PROP_TARGET) >> $@