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

Commit d9fe8f5a authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Deliver all_release_configs.json as a build artifact" into main

parents 58ab571b 3b9a9351

core/release_config.mk

+16 −1
Original line number Diff line number Diff line
@@ -130,7 +130,8 @@ ifneq (,$(_use_protobuf)) 
        # Disable the build flag in release-config.

        _args += --guard=false

    endif

    _flags_file:=$(OUT_DIR)/soong/release-config/release_config-$(TARGET_PRODUCT)-$(TARGET_RELEASE).vars

    _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))
@@ -148,7 +149,21 @@ ifneq (,$(_use_protobuf)) 
    _used_files :=

    ifeq (,$(_must_protobuf)$(RELEASE_BUILD_FLAGS_IN_PROTOBUF))

        _use_protobuf :=

    else

        _base_all_release := all_release_configs-$(TARGET_PRODUCT)

        $(call dist-for-goals,droid,\

            $(_flags_dir)/$(_base_all_release).pb:build_flags/all_release_configs.pb \

            $(_flags_dir)/$(_base_all_release).textproto:build_flags/all_release_configs.textproto \

            $(_flags_dir)/$(_base_all_release).json:build_flags/all_release_configs.json \

        )

# These are always created, add an empty rule for them to keep ninja happy.

$(_flags_dir)/$(_base_all_release).pb $(_flags_dir)/$(_base_all_release).textproto $(_flags_dir)/$(_base_all_release).json:

	: created by $(OUT_DIR)/release-config

        _base_all_release :=

    endif

    _flags_dir:=

    _flags_file:=

    _flags_varmk:=

endif

ifeq (,$(_use_protobuf))

    # The .mk files are the canonical source of truth.