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

Commit 7febcdf7 authored by Bryan Henry's avatar Bryan Henry
Browse files

Revert "Support regenerating partition table with bpttool in sign_target_files_apks" 

This reverts commit 2a40cc69.

Reason for revert: Broke a bunch of builds, platform/system/tools/bpt must be missing from more manifests.

Change-Id: I4c367a1fec5c62c247544227e9d3b596227e31da
parent dde5f11e

core/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -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)

tools/releasetools/common.py

+0 −9
Original line number Diff line number Diff line
@@ -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)