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

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

Merge "Convert release config artifacts dist rules to Soong" into main am:... 

Merge "Convert release config artifacts dist rules to Soong" into main am: 59617be5 am: 30b09e48

Original change: https://android-review.googlesource.com/c/platform/build/+/3489213



Change-Id: I9d7f2943460784cc38fbbf9c139de0fba90145a2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1ae38d19 30b09e48

core/release_config.mk

+0 −14
Original line number Diff line number Diff line
@@ -156,20 +156,6 @@ 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 \

            $(_flags_dir)/inheritance_graph-$(TARGET_PRODUCT).dot:build_flags/inheritance_graph-$(TARGET_PRODUCT).dot \

        )

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

$(_flags_dir)/inheritance_graph-$(TARGET_PRODUCT).dot:

	: created by $(OUT_DIR)/release-config

$(_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:=