Merge "Skip generate-common-build-props for older devices without /product"

#       $(3) and (4) are affected

# $(6): optional list of files to append at the end. The content of each file is emitted

#       to the output

# $(7): optional flag to skip common properties generation

define build-properties

ALL_DEFAULT_INSTALLED_MODULES += $(2)

	$(hide) echo Building $$@

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

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

ifneq ($(strip $(7)), true)

	$(hide) $$(call generate-common-build-props,$(call to-lower,$(strip $(1))),$$@)

endif

	$(hide) $(foreach file,$(strip $(3)),\

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

	        echo "" >> $$@;\

    $(_prop_files_),\

    $(_prop_vars_),\

    $(_blacklist_names_),\

    $(empty),\

    $(empty)))

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

    $(_prop_files_),\

    $(_prop_vars_),\

    $(PRODUCT_VENDOR_PROPERTY_BLACKLIST),\

    $(empty),\

    $(empty)))

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

_footers_ :=

endif

# Skip common /product properties generation if device released before R and

# has no product partition. This is the first part of the check.

ifeq ($(call math_lt,$(if $(PRODUCT_SHIPPING_API_LEVEL),$(PRODUCT_SHIPPING_API_LEVEL),30),30), true)

  _skip_common_properties := true

endif

# The second part of the check - always generate common properties for the

# devices with product partition regardless of shipping level.

ifneq ($(BOARD_USES_PRODUCTIMAGE),)

  _skip_common_properties :=

endif

$(eval $(call build-properties,\

    product,\

    $(INSTALLED_PRODUCT_BUILD_PROP_TARGET),\

    $(_prop_files_),\

    $(_prop_vars_),\

    $(empty),\

    $(_footers_)))

    $(_footers_),\

    $(_skip_common_properties)))

_skip_common_properties :=

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

# odm/etc/build.prop

    $(_prop_files),\

    $(_prop_vars_),\

    $(empty),\

    $(empty),\

    $(empty)))

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

    $(empty),\

    $(empty),\

    $(empty),\

    $(empty),\

    $(empty)))

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

    $(empty),\

    $(empty),\

    $(empty),\

    $(empty),\

    $(empty)))

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

    $(_prop_files_),\

    $(_prop_vars_),\

    $(empty),\

    $(empty),\

    $(empty)))

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

    $(empty),\

    $(empty),\

    $(empty),\

    $(empty),\

    $(empty)))