openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

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

am: 603e4ed594

* commit '603e4ed594b99b9463a9a67c1f7ba91b2967025e':
  Fix "make product-graph" and "make dump-products".
This commit is contained in:
Ying Wang 2015-11-02 19:55:06 +00:00 committed by android-build-merger
parent 5887bfbe20 603e4ed594
commit 6a019f1d2e
4 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/Makefile
View File

@ -1972,6 +1972,8 @@ include $(sort $(wildcard $(BUILD_SYSTEM)/tasks/*.mk))
-include $(sort $(wildcard device/*/*/build/tasks/*.mk)) -include $(sort $(wildcard device/*/*/build/tasks/*.mk))
endif endif
include $(BUILD_SYSTEM)/product-graph.mk
# ----------------------------------------------------------------- # -----------------------------------------------------------------
# Create SDK repository packages. Must be done after tasks/* since # Create SDK repository packages. Must be done after tasks/* since
# we need the addon rules defined. # we need the addon rules defined.

3
core/main.mk
View File

@ -80,7 +80,8 @@ dont_bother_goals := clean clobber dataclean installclean \
vendorimage-nodeps \ vendorimage-nodeps \
ramdisk-nodeps \ ramdisk-nodeps \
bootimage-nodeps \ bootimage-nodeps \
recoveryimage-nodeps recoveryimage-nodeps \
product-graph dump-products
ifneq ($(filter $(dont_bother_goals), $(MAKECMDGOALS)),) ifneq ($(filter $(dont_bother_goals), $(MAKECMDGOALS)),)
dont_bother := true dont_bother := true

2
core/tasks/product-graph.mk → core/product-graph.mk
View File

@ -34,7 +34,7 @@ define all-products-inner
endef endef
this_makefile := build/core/tasks/product-graph.mk this_makefile := build/core/product-graph.mk
products_svg := $(OUT_DIR)/products.svg products_svg := $(OUT_DIR)/products.svg
products_pdf := $(OUT_DIR)/products.pdf products_pdf := $(OUT_DIR)/products.pdf

14
core/product_config.mk
View File

@ -213,7 +213,19 @@ _cpm_word2 :=
current_product_makefile := $(strip $(current_product_makefile)) current_product_makefile := $(strip $(current_product_makefile))
all_product_makefiles := $(strip $(all_product_makefiles)) 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. # Import all product makefiles.
$(call import-products, $(all_product_makefiles)) $(call import-products, $(all_product_makefiles))
else else