From 4429054bb1b189638c31196ab616a70f5377c48d Mon Sep 17 00:00:00 2001
From: Gil Cukierman <cukie@google.com>
Date: Wed, 21 Sep 2022 17:48:20 +0000
Subject: [PATCH] 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 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/unit/AndroidTest.xml b/tests/unit/AndroidTest.xml
index b9321a3021a..1b070adaf89 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" />