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

Commit 4941f6fd authored by Jooyung Han's avatar Jooyung Han Committed by Automerger Merge Worker
Browse files

Merge "Remove --blkid_path argument" am: e4635b3e 

Original change: https://android-review.googlesource.com/c/platform/build/+/2624574



Change-Id: Icb064093d587479713e7da5bd670d4cb36f977a3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 514a12d7 e4635b3e

core/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -5297,7 +5297,6 @@ INTERNAL_OTATOOLS_MODULES := \ 
INTERNAL_OTATOOLS_MODULES += \

  apexer \

  apex_compression_tool \

  blkid_static \

  deapexer \

  debugfs_static \

  dump_apex_info \

tools/releasetools/apex_utils.py

+1 −8
Original line number Diff line number Diff line
@@ -65,8 +65,6 @@ class ApexApkSigner(object): 
        OPTIONS.search_path, "bin", "debugfs_static")

    self.fsckerofs_path = os.path.join(

        OPTIONS.search_path, "bin", "fsck.erofs")

    self.blkid_path = os.path.join(

        OPTIONS.search_path, "bin", "blkid_static")

    self.avbtool = avbtool if avbtool else "avbtool"

    self.sign_tool = sign_tool
@@ -129,15 +127,10 @@ class ApexApkSigner(object): 
          "Couldn't find location of fsck.erofs: " +

          "Path {} does not exist. ".format(self.fsckerofs_path) +

          "Make sure bin/fsck.erofs can be found in -p <path>")

    if not os.path.exists(self.blkid_path):

      raise ApexSigningError(

          "Couldn't find location of blkid: " +

          "Path {} does not exist. ".format(self.blkid_path) +

          "Make sure bin/blkid can be found in -p <path>")

    payload_dir = common.MakeTempDir()

    extract_cmd = ['deapexer', '--debugfs_path', self.debugfs_path,

                   '--fsckerofs_path', self.fsckerofs_path,

                   '--blkid_path', self.blkid_path, 'extract',

                   'extract',

                   self.apex_path, payload_dir]

    common.RunAndCheckOutput(extract_cmd)

    assert os.path.exists(self.apex_path)

tools/releasetools/check_target_files_vintf.py

+0 −3
Original line number Diff line number Diff line
@@ -232,12 +232,10 @@ def PrepareApexDirectory(inp): 


  deapexer = 'deapexer'

  debugfs_path = 'debugfs'

  blkid_path = 'blkid'

  fsckerofs_path = 'fsck.erofs'

  if OPTIONS.search_path:

    debugfs_path = os.path.join(OPTIONS.search_path, 'bin', 'debugfs_static')

    deapexer_path = os.path.join(OPTIONS.search_path, 'bin', 'deapexer')

    blkid_path = os.path.join(OPTIONS.search_path, 'bin', 'blkid_static')

    fsckerofs_path = os.path.join(OPTIONS.search_path, 'bin', 'fsck.erofs')

    if os.path.isfile(deapexer_path):

      deapexer = deapexer_path
@@ -263,7 +261,6 @@ def PrepareApexDirectory(inp): 
        cmd = [deapexer,

               '--debugfs_path', debugfs_path,

               '--fsckerofs_path', fsckerofs_path,

               '--blkid_path', blkid_path,

               'extract',

               apex,

               os.path.join(outp, info['name'])]

tools/releasetools/merge/merge_dexopt.py

+0 −2
Original line number Diff line number Diff line
@@ -164,8 +164,6 @@ def MergeDexopt(temp_dir, output_target_files_dir): 
          'deapexer',

          '--debugfs_path',

          'debugfs_static',

          '--blkid_path',

          'blkid',

          '--fsckerofs_path',

          'fsck.erofs',

          'extract',