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

Commit 8646755b authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Switch to aapt2" am: 002863d6 am: 7db84e82 am: 6059d763

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

Change-Id: Ia8c036377f7b6a53a3d016f062d6b01eebe13323
parents 46b06d97 6059d763
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ class ApexUtilsTest(test_utils.ReleaseToolsTestCase):

    self.payload_key = os.path.join(self.testdata_dir, 'testkey_RSA4096.key')
    apex_file = signer.ProcessApexFile(apk_keys, self.payload_key)
    package_name_extract_cmd = ['aapt', 'dump', 'badging', apex_file]
    package_name_extract_cmd = ['aapt2', 'dump', 'badging', apex_file]
    output = common.RunAndCheckOutput(package_name_extract_cmd)
    for line in output.splitlines():
      # Sample output from aapt: "package: name='com.google.android.wifi'