Merge "Treat aapt parse failures as BuildErrors."
diff --git a/prod-tests/src/com/android/monkey/AppPkgInjector.java b/prod-tests/src/com/android/monkey/AppPkgInjector.java
index 22258bb..888f8cf 100644
--- a/prod-tests/src/com/android/monkey/AppPkgInjector.java
+++ b/prod-tests/src/com/android/monkey/AppPkgInjector.java
@@ -63,12 +63,13 @@
for (VersionedFile apkFile : appBuild.getAppPackageFiles()) {
AaptParser aapt = AaptParser.parse(apkFile.getFile());
if (aapt == null) {
- // TODO: should this be BuildError?
- throw new TargetSetupError(String.format("aapt parse of %s failed",
+ // throw a build error because typically aapt parse errors are issues with the apk
+ throw new BuildError(String.format("aapt parse of %s failed",
apkFile.getFile().getAbsolutePath()));
}
String pkgName = aapt.getPackageName();
if (pkgName == null) {
+ // this should never happen
throw new TargetSetupError(String.format("Failed to parse package name from %s",
apkFile.getFile().getAbsolutePath()));
}