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

Commit ce632edf authored by changho.shin's avatar changho.shin Committed by Michael Bestas
Browse files

Switch to aapt2 for getting minSdkVersion 

aapt does not support parsing some referencing attributes.
Switch to latest tool, aapt2, which works better.

Test: aapt2 dump badging test.apk and returned 0.
Test: Run check_target_files_signatures.py with a target_files.zip.
Test: Run sign_target_files_apks.py with a target_files.zip.
Change-Id: Ib3a4740506f29ebab6930767f2aa8a0b5c4ba053
parent 5ecb42fd

core/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -3489,7 +3489,7 @@ endif 


ifeq ($(build_otatools_package),true)

OTATOOLS :=  $(HOST_OUT_EXECUTABLES)/minigzip \

  $(HOST_OUT_EXECUTABLES)/aapt \

  $(HOST_OUT_EXECUTABLES)/aapt2 \

  $(HOST_OUT_EXECUTABLES)/checkvintf \

  $(HOST_OUT_EXECUTABLES)/mkbootfs \

  $(HOST_OUT_EXECUTABLES)/mkbootimg \

tools/releasetools/check_target_files_signatures.py

+1 −1
Original line number Diff line number Diff line
@@ -213,7 +213,7 @@ class APK(object): 
    self.certs = frozenset(out)



  def ReadManifest(self, full_filename):

    p = common.Run(["aapt", "dump", "xmltree", full_filename,

    p = common.Run(["aapt2", "dump", "xmltree", full_filename, "--file",

                    "AndroidManifest.xml"],

                   stdout=subprocess.PIPE)

    manifest, err = p.communicate()

tools/releasetools/common.py

+4 −4
Original line number Diff line number Diff line
@@ -1049,7 +1049,7 @@ def GetKeyPasswords(keylist): 
def GetMinSdkVersion(apk_name):

  """Gets the minSdkVersion declared in the APK.



  It calls 'aapt' to query the embedded minSdkVersion from the given APK file.

  It calls 'aapt2' to query the embedded minSdkVersion from the given APK file.

  This can be both a decimal number (API Level) or a codename.



  Args:
@@ -1062,12 +1062,12 @@ def GetMinSdkVersion(apk_name): 
    ExternalError: On failing to obtain the min SDK version.

  """

  proc = Run(

      ["aapt", "dump", "badging", apk_name], stdout=subprocess.PIPE,

      ["aapt2", "dump", "badging", apk_name], stdout=subprocess.PIPE,

      stderr=subprocess.PIPE)

  stdoutdata, stderrdata = proc.communicate()

  if proc.returncode != 0:

    raise ExternalError(

        "Failed to obtain minSdkVersion: aapt return code {}:\n{}\n{}".format(

        "Failed to obtain minSdkVersion: aapt2 return code {}:\n{}\n{}".format(

            proc.returncode, stdoutdata, stderrdata))



  for line in stdoutdata.split("\n"):
@@ -1075,7 +1075,7 @@ def GetMinSdkVersion(apk_name): 
    m = re.match(r'sdkVersion:\'([^\']*)\'', line)

    if m:

      return m.group(1)

  raise ExternalError("No minSdkVersion returned by aapt")

  raise ExternalError("No minSdkVersion returned by aapt2")





def GetMinSdkVersionInt(apk_name, codename_to_api_level_map):