From 04d15dd9a35143e3b0754dd9cbb28c72836c703d Mon Sep 17 00:00:00 2001 From: Casey Dahlin Date: Fri, 19 Aug 2016 10:59:57 -0700 Subject: [PATCH] List partition_table.bpt as an output of running bpttool Change-Id: I8bb1e03e451bf148e421ecac346bf20ce5d4695b Test: Verified builds can now depend on partition_table.bpt Bug: 30971990 --- core/Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/core/Makefile b/core/Makefile index 1d13e7e89..9a55dde33 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1440,10 +1440,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 @@ -1456,6 +1457,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)