Merge "Rename MODULE_EXCEPTIONS to APK_EXCEPTIONS"
diff --git a/tools/cts-tradefed/tests/src/com/android/compatibility/common/tradefed/presubmit/ValidateTestsAbi.java b/tools/cts-tradefed/tests/src/com/android/compatibility/common/tradefed/presubmit/ValidateTestsAbi.java
index eada254..4225f78 100644
--- a/tools/cts-tradefed/tests/src/com/android/compatibility/common/tradefed/presubmit/ValidateTestsAbi.java
+++ b/tools/cts-tradefed/tests/src/com/android/compatibility/common/tradefed/presubmit/ValidateTestsAbi.java
@@ -44,41 +44,41 @@
@RunWith(JUnit4.class)
public class ValidateTestsAbi {
- private static final Set<String> MODULE_EXCEPTIONS = new HashSet<>();
+ private static final Set<String> APK_EXCEPTIONS = new HashSet<>();
static {
/**
* This particular module is shipping all its dependencies in all abis with prebuilt stuff.
* Excluding it for now to have the test setup.
*/
- MODULE_EXCEPTIONS.add("CtsSplitApp");
+ APK_EXCEPTIONS.add("CtsSplitApp");
/**
* This module tests for security vulnerabilities when installing attacker-devised APKs.
*/
- MODULE_EXCEPTIONS.add("CtsCorruptApkTests");
+ APK_EXCEPTIONS.add("CtsCorruptApkTests");
/**
* This module tests for installations of packages that have only 32-bit native libraries
* and extract native libraries.
*/
- MODULE_EXCEPTIONS.add("CtsExtractNativeLibsAppTrue32");
+ APK_EXCEPTIONS.add("CtsExtractNativeLibsAppTrue32");
/**
* This module tests for installations of packages that have only 64-bit native libraries
* and extract native libraries.
*/
- MODULE_EXCEPTIONS.add("CtsExtractNativeLibsAppTrue64");
+ APK_EXCEPTIONS.add("CtsExtractNativeLibsAppTrue64");
/**
* This module tests for installations of packages that have only 32-bit native libraries
* and embed native libraries.
*/
- MODULE_EXCEPTIONS.add("CtsExtractNativeLibsAppFalse32");
+ APK_EXCEPTIONS.add("CtsExtractNativeLibsAppFalse32");
/**
* This module tests for installations of packages that have only 64-bit native libraries
* and embed native libraries.
*/
- MODULE_EXCEPTIONS.add("CtsExtractNativeLibsAppFalse64");
+ APK_EXCEPTIONS.add("CtsExtractNativeLibsAppFalse64");
}
private static final Set<String> BINARY_EXCEPTIONS = new HashSet<>();
@@ -114,8 +114,8 @@
File[] listApks = testcases.listFiles(new FilenameFilter() {
@Override
public boolean accept(File dir, String name) {
- for (String module : MODULE_EXCEPTIONS) {
- if (name.startsWith(module)) {
+ for (String apk : APK_EXCEPTIONS) {
+ if (name.startsWith(apk)) {
return false;
}
}