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

Commit 75db430a authored by Casey Dahlin's avatar Casey Dahlin Committed by android-build-merger
Browse files

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

am: 14aa63a5

Change-Id: If2ef06aa3c0b77506ccd7384577497d2a49456bc
parents ffa6f37f 14aa63a5

core/Makefile

+5 −1
Original line number Original line Diff line number Diff line
@@ -1438,10 +1438,11 @@ userdatatarball-nodeps: $(FS_GET_STATS) 
ifdef BOARD_BPT_INPUT_FILES

ifdef BOARD_BPT_INPUT_FILES





BUILT_BPTIMAGE_TARGET := $(PRODUCT_OUT)/partition-table.img

BUILT_BPTIMAGE_TARGET := $(PRODUCT_OUT)/partition-table.img

BUILT_BPTJSON_TARGET := $(PRODUCT_OUT)/partition-table.bpt





INTERNAL_BVBTOOL_MAKE_TABLE_ARGS := \

INTERNAL_BVBTOOL_MAKE_TABLE_ARGS := \

	--output_gpt $(BUILT_BPTIMAGE_TARGET) \

	--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))

	$(foreach file, $(BOARD_BPT_INPUT_FILES), --input $(file))





ifdef BOARD_BPT_DISK_SIZE

ifdef BOARD_BPT_DISK_SIZE
@@ -1454,6 +1455,9 @@ define build-bptimage-target 
endef

endef





INSTALLED_BPTIMAGE_TARGET := $(BUILT_BPTIMAGE_TARGET)

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)

$(INSTALLED_BPTIMAGE_TARGET): $(BPTTOOL) $(BOARD_BPT_INPUT_FILES)

	$(build-bptimage-target)

	$(build-bptimage-target)