aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYuexi Ma <yuexima@google.com>2021-03-19 17:27:06 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-03-19 17:27:06 +0000
commit82348f0853f35770ed806ea2282bf3e0f24270ad (patch)
treebd4396f8cf14151cd6a5684b3535c97ce08a8d82
parentc0b6a458c48ecc3c69fc0483900c463e9d7ee251 (diff)
parent0aba33b17a04a460d2250e7705eb60fed90ad8d7 (diff)
downloadcsuite-82348f0853f35770ed806ea2282bf3e0f24270ad.tar.gz
Merge "Set default value of AAPT version to AAPT2" am: 0aba33b17a
Original change: https://android-review.googlesource.com/c/platform/test/app_compat/csuite/+/1643413 Change-Id: I5519a3fe5041c57bedf3bcd7e2ca09a9ee65e94d
-rw-r--r--harness/src/main/java/com/android/compatibility/targetprep/AppSetupPreparer.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/harness/src/main/java/com/android/compatibility/targetprep/AppSetupPreparer.java b/harness/src/main/java/com/android/compatibility/targetprep/AppSetupPreparer.java
index 9445316..7652fe2 100644
--- a/harness/src/main/java/com/android/compatibility/targetprep/AppSetupPreparer.java
+++ b/harness/src/main/java/com/android/compatibility/targetprep/AppSetupPreparer.java
@@ -71,7 +71,7 @@ public final class AppSetupPreparer implements ITargetPreparer {
private final List<File> mTestFiles = new ArrayList<>();
@Option(name = OPTION_AAPT_VERSION, description = "The version of AAPT for APK parsing.")
- private AaptVersion mAaptVersion = AaptVersion.AAPT;
+ private AaptVersion mAaptVersion = AaptVersion.AAPT2;
@Option(
name = OPTION_INSTALL_ARG,