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

Commit 6a019f1d authored by Ying Wang's avatar Ying Wang Committed by android-build-merger
Browse files

Merge "Fix "make product-graph" and "make dump-products"." am: 888f30aa 

am: 603e4ed5

* commit '603e4ed5':
  Fix "make product-graph" and "make dump-products".
parents 5887bfbe 603e4ed5

core/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -1972,6 +1972,8 @@ include $(sort $(wildcard $(BUILD_SYSTEM)/tasks/*.mk)) 
-include $(sort $(wildcard device/*/*/build/tasks/*.mk))

endif



include $(BUILD_SYSTEM)/product-graph.mk



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

# Create SDK repository packages. Must be done after tasks/* since

# we need the addon rules defined.

core/main.mk

+2 −1
Original line number Diff line number Diff line
@@ -80,7 +80,8 @@ dont_bother_goals := clean clobber dataclean installclean \ 
    vendorimage-nodeps \

    ramdisk-nodeps \

    bootimage-nodeps \

    recoveryimage-nodeps

    recoveryimage-nodeps \

    product-graph dump-products



ifneq ($(filter $(dont_bother_goals), $(MAKECMDGOALS)),)

dont_bother := true

core/tasks/product-graph.mk→core/product-graph.mk

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ define all-products-inner 
endef





this_makefile := build/core/tasks/product-graph.mk

this_makefile := build/core/product-graph.mk



products_svg := $(OUT_DIR)/products.svg

products_pdf := $(OUT_DIR)/products.pdf

core/product_config.mk

+13 −1
Original line number Diff line number Diff line
@@ -213,7 +213,19 @@ _cpm_word2 := 
current_product_makefile := $(strip $(current_product_makefile))

all_product_makefiles := $(strip $(all_product_makefiles))



ifneq (,$(filter product-graph dump-products, $(MAKECMDGOALS)))

load_all_product_makefiles :=

ifneq (,$(filter product-graph, $(MAKECMDGOALS)))

ifeq ($(ANDROID_PRODUCT_GRAPH),--all)

load_all_product_makefiles := true

endif

endif

ifneq (,$(filter dump-products,$(MAKECMDGOALS)))

ifeq ($(ANDROID_DUMP_PRODUCTS),all)

load_all_product_makefiles := true

endif

endif



ifeq ($(load_all_product_makefiles),true)

# Import all product makefiles.

$(call import-products, $(all_product_makefiles))

else