commit f5f3eaf01c45f776be8e67717384f5ce733e8c57
author Kelvin Zhang <zhangkelvin@google.com> Fri Aug 28 17:39:11 2020 -0400
committer Kelvin Zhang <zhangkelvin@google.com> Fri Aug 28 17:40:29 2020 -0400
tree 44098e4cbe53e60402ff8c5f14156e5501bbbf08
parent 0068973f73b94bc5446cf6f7d815c21d370b90fc

Switch to aapt2

We already moved to aapt2 in Android.bp, no aapt binary in otatools.zip.
So tests should be updated accordingly.

Test: unittest
Change-Id: I29776d75e108e16bcceda49b8be47a338ee8bc1c

tools/releasetools/test_apex_utils.py

diff --git a/tools/releasetools/test_apex_utils.py b/tools/releasetools/test_apex_utils.py
index 7b4a4b0..339ddc7 100644
--- a/tools/releasetools/test_apex_utils.py
+++ b/tools/releasetools/test_apex_utils.py
@@ -160,7 +160,7 @@
 
     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'