tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Revert "Support regenerating partition table with bpttool in sign_target_files_apks""

Browse source 
am: f45bf2d59f

Change-Id: I625c3f9269fc7fe06056ff4476238b1705f4a083
This commit is contained in:
android-build-prod (mdb) 2018-04-27 13:49:07 -07:00 committed by android-build-merger
commit 401da96dae
2 changed files with 0 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
core/Makefile
View file

@ -2352,7 +2352,6 @@ OTATOOLS := $(HOST_OUT_EXECUTABLES)/minigzip \
$(HOST_OUT_EXECUTABLES)/delta_generator \ $(HOST_OUT_EXECUTABLES)/delta_generator \
$(AVBTOOL) \ $(AVBTOOL) \
$(BLK_ALLOC_TO_BASE_FS) \ $(BLK_ALLOC_TO_BASE_FS) \
$(BPTTOOL) \
$(BROTLI) \ $(BROTLI) \
$(BUILD_VERITY_METADATA) \ $(BUILD_VERITY_METADATA) \
$(BUILD_VERITY_TREE) $(BUILD_VERITY_TREE)

9
tools/releasetools/common.py
View file

@ -222,15 +222,6 @@ def LoadInfoDict(input_file, input_dir=None):
vendor_base_fs_file,)) vendor_base_fs_file,))
del d["vendor_base_fs_file"] del d["vendor_base_fs_file"]
# If board_bpt_input_files property is defined then bpttool is being used to
# generate the partition table. When signing target-files, the combined
# partition table definition is copied into META/partition-table.bpt since
# the original input files aren't available.
if "board_bpt_input_files" in d:
board_bpt_input_files = os.path.join(input_dir, "META", "partition-table.bpt")
if os.path.exists(board_bpt_input_files):
d["board_bpt_input_files"] = board_bpt_input_files
def makeint(key): def makeint(key):
if key in d: if key in d:
d[key] = int(d[key], 0) d[key] = int(d[key], 0)