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

Commit 19adb2b3 authored by LaMont Jones's avatar LaMont Jones Committed by Android (Google) Code Review
Browse files

Merge "Include $TARGET_PRODUCT in more file names" into main

parents 64769e25 e5299f33

core/product_validation_checks.mk

+2 −2
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ _c+=$(newline)) 
_c+=$(newline))

_c+=$(foreach f,$(PRODUCT_VALIDATION_CHECKS),$(newline)validate_product_variables_$(call filename_to_starlark,$(f))(_ctx))

_c+=$(newline)variables_to_export_to_make = {}

$(KATI_file_no_rerun >$(OUT_DIR)/product_validation_checks_entrypoint.scl,$(_c))

$(KATI_file_no_rerun >$(OUT_DIR)/product_validation_checks_entrypoint.$(TARGET_PRODUCT).scl,$(_c))

filename_to_starlark:=

escape_starlark_string:=

product_variable_starlark_value:=
@@ -67,6 +67,6 @@ known_board_list_variables := 
#

# We also need to pass --allow_external_entrypoint to rbcrun in case the OUT_DIR is set to something

# outside of the source tree.

$(call run-starlark,$(OUT_DIR)/product_validation_checks_entrypoint.scl,$(OUT_DIR)/product_validation_checks_entrypoint.scl,--allow_external_entrypoint)

$(call run-starlark,$(OUT_DIR)/product_validation_checks_entrypoint.$(TARGET_PRODUCT).scl,$(OUT_DIR)/product_validation_checks_entrypoint.$(TARGET_PRODUCT).scl,--allow_external_entrypoint)



endif # ifdef PRODUCT_VALIDATION_CHECKS

core/release_config.mk

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ _flags_dir:=$(OUT_DIR)/soong/release-config 
_flags_file:=$(_flags_dir)/release_config-$(TARGET_PRODUCT)-$(TARGET_RELEASE).vars

# release-config generates $(_flags_varmk)

_flags_varmk:=$(_flags_file:.vars=.varmk)

$(shell $(OUT_DIR)/release-config $(_args) >$(OUT_DIR)/release-config.out && touch -t 200001010000 $(_flags_varmk))

$(shell $(OUT_DIR)/release-config $(_args) >$(OUT_DIR)/release-config.${TARGET_PRODUCT}.out && touch -t 200001010000 $(_flags_varmk))

$(if $(filter-out 0,$(.SHELLSTATUS)),$(error release-config failed to run))

ifneq (,$(_final_product_config_pass))

    # Save the final version of the config.