Merge "List partition_table.bpt as an output of running bpttool" am: aba93cf736 am: 14aa63a52a am: 75db430a08

am: d1584a5d77

Change-Id: Ia7497f943aa68021d569e025472cffb6d2d85a2b
This commit is contained in:
Casey Dahlin 2016-08-23 01:10:55 +00:00 committed by android-build-merger
commit 5d58dc276a

View file

@ -1452,10 +1452,11 @@ userdatatarball-nodeps: $(FS_GET_STATS)
ifdef BOARD_BPT_INPUT_FILES
BUILT_BPTIMAGE_TARGET := $(PRODUCT_OUT)/partition-table.img
BUILT_BPTJSON_TARGET := $(PRODUCT_OUT)/partition-table.bpt
INTERNAL_BVBTOOL_MAKE_TABLE_ARGS := \
--output_gpt $(BUILT_BPTIMAGE_TARGET) \
--output_json $(PRODUCT_OUT)/partition-table.bpt \
--output_json $(BUILT_BPTJSON_TARGET) \
$(foreach file, $(BOARD_BPT_INPUT_FILES), --input $(file))
ifdef BOARD_BPT_DISK_SIZE
@ -1468,6 +1469,9 @@ define build-bptimage-target
endef
INSTALLED_BPTIMAGE_TARGET := $(BUILT_BPTIMAGE_TARGET)
$(BUILT_BPTJSON_TARGET): $(INSTALLED_BPTIMAGE_TARGET)
$(hide) touch -c $(BUILT_BPTJSON_TARGET)
$(INSTALLED_BPTIMAGE_TARGET): $(BPTTOOL) $(BOARD_BPT_INPUT_FILES)
$(build-bptimage-target)