Only install necessary prequisite apks.
Bug 5513483
Change-Id: Ic93592799108300d71677d7a317dd6e926502159
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 8f0ed2d..8844667 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
@@ -68,6 +68,8 @@
private String mClassName;
private String mMethodName;
private TestFilter mExcludedTestFilter = new TestFilter();
+ private String mTargetBinaryName;
+ private String mTargetNameSpace;
void setUri(String uri) {
mUri = uri;
@@ -162,6 +164,30 @@
mApkToTestName = apkName;
}
+ void setTargetBinaryName(String targetBinaryName) {
+ mTargetBinaryName = targetBinaryName;
+ }
+
+ void setTargetNameSpace(String targetNameSpace) {
+ mTargetNameSpace = targetNameSpace;
+ }
+
+ @Override
+ public String getTargetApkName() {
+ if (mTargetBinaryName != null && !mTargetBinaryName.isEmpty()) {
+ return String.format("%s.apk", mTargetBinaryName);
+ }
+ return null;
+ }
+
+ @Override
+ public String getTargetPackageName() {
+ if (mTargetNameSpace != null && mTargetNameSpace.isEmpty()) {
+ return null;
+ }
+ return mTargetNameSpace;
+ }
+
/**
* {@inheritDoc}
*/