commit 4429054bb1b189638c31196ab616a70f5377c48d
author Gil Cukierman <cukie@google.com> Wed Sep 21 17:48:20 2022 +0000
committer Gil Cukierman <cukie@google.com> Wed Sep 21 17:48:20 2022 +0000
tree 6557359a259e87f29ff35d391c3eff762f22973c
parent 0960af0bf3ce0a284e317df2cfc57408e561d06d

Use AAPT2 For SettingsUnitTests

Forces tradefed to use aapt2 for SettingsUnitTests to get around
the issue of Settings.apk not being parseable by aapt.

Bug: 247779071
Test: atest SettingsUnitTests
Change-Id: I8af260f8d2c438512d3e61f0028accf7b40c8a00

tests/unit/AndroidTest.xml

diff --git a/tests/unit/AndroidTest.xml b/tests/unit/AndroidTest.xml
index b9321a3..1b070ad 100644
--- a/tests/unit/AndroidTest.xml
+++ b/tests/unit/AndroidTest.xml
@@ -19,6 +19,7 @@
     <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="SettingsUnitTests.apk" />
+        <option name="aapt-version" value="AAPT2" />
     </target_preparer>
 
     <option name="test-tag" value="SettingsUnitTests" />