From 7febcdf75f10f2703d2e28d6d68db60bdc4e3e2b Mon Sep 17 00:00:00 2001 From: Bryan Henry Date: Fri, 27 Apr 2018 19:01:29 +0000 Subject: [PATCH] Revert "Support regenerating partition table with bpttool in sign_target_files_apks" This reverts commit 2a40cc6996cf2fa1e09404e065c30babf70c5318. Reason for revert: Broke a bunch of builds, platform/system/tools/bpt must be missing from more manifests. Change-Id: I4c367a1fec5c62c247544227e9d3b596227e31da --- core/Makefile | 1 - tools/releasetools/common.py | 9 --------- 2 files changed, 10 deletions(-) diff --git a/core/Makefile b/core/Makefile index 781bc27ef..706b37155 100644 --- a/core/Makefile +++ b/core/Makefile @@ -2352,7 +2352,6 @@ OTATOOLS := $(HOST_OUT_EXECUTABLES)/minigzip \ $(HOST_OUT_EXECUTABLES)/delta_generator \ $(AVBTOOL) \ $(BLK_ALLOC_TO_BASE_FS) \ - $(BPTTOOL) \ $(BROTLI) \ $(BUILD_VERITY_METADATA) \ $(BUILD_VERITY_TREE) diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py index 1deb03189..14d0ca49a 100644 --- a/tools/releasetools/common.py +++ b/tools/releasetools/common.py @@ -222,15 +222,6 @@ def LoadInfoDict(input_file, input_dir=None): 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): if key in d: d[key] = int(d[key], 0)