Tracking merge of dalvik-dev to master
React to move of Base64 in libcore for CTS
git cherry-pick --no-commit bf4c21cfbd8d8eabd2ec9af0f315d5baff626580
Breakup android.core.tests.libcore based on top level package name
git cherry-pick --no-commit 45490fa3d469f4a581ecac46ac40c7a4a9af4aaf
DexFile constructor now takes an argument.
git cherry-pick --no-commit 583eab2ec924dadebd45b1189929f1acec08c7c7
Change-Id: I9b8b717f13fdc9d4499fd9e7a7b488c7537d3f79
diff --git a/tools/tradefed-host/src/com/android/cts/tradefed/testtype/TestPackageDef.java b/tools/tradefed-host/src/com/android/cts/tradefed/testtype/TestPackageDef.java
index e89ed2f..20396f7 100644
--- a/tools/tradefed-host/src/com/android/cts/tradefed/testtype/TestPackageDef.java
+++ b/tools/tradefed-host/src/com/android/cts/tradefed/testtype/TestPackageDef.java
@@ -47,6 +47,7 @@
private boolean mIsReferenceAppTest = false;
private String mPackageToTest = null;
private String mApkToTestName = null;
+ private String mTestPackageName = null;
// use a LinkedHashSet for predictable iteration insertion-order, and fast lookups
private Collection<TestIdentifier> mTests = new LinkedHashSet<TestIdentifier>();
@@ -133,6 +134,10 @@
mPackageToTest = packageName;
}
+ void setTestPackageName(String testPackageName) {
+ mTestPackageName = testPackageName;
+ }
+
void setApkToTest(String apkName) {
mApkToTestName = apkName;
}
@@ -195,6 +200,7 @@
String methodName, InstrumentationApkTest instrTest) {
instrTest.setPackageName(mAppNameSpace);
instrTest.setRunnerName(mRunner);
+ instrTest.setTestPackageName(mTestPackageName);
instrTest.setClassName(className);
instrTest.setMethodName(methodName);
// mName means 'apk file name' for instrumentation tests