commit 14aa63a52a3e05079b85c409ec1c1c98f0781458
author Casey Dahlin <sadmac@google.com> Tue Aug 23 00:56:19 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Aug 23 00:56:19 2016 +0000
tree ca91b55000e20afcb0a612ab30775eb78967df83
parent cfab69eb322f8e613f099256fcf8dae00032f3cd
parent aba93cf736b927dc5312f233535360fcc92603e2

Merge "List partition_table.bpt as an output of running bpttool"
am: aba93cf736

Change-Id: Ib986d3551a2bfff5ce813139380378b11dd84d82

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 83bbfd9..fa787b5 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1438,10 +1438,11 @@
 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
@@ -1454,6 +1455,9 @@
 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)