commit 9f294d7c5263e9e1eb6e8ad6265584ac6b7849dd
author Andreas Gampe <agampe@google.com> Fri Mar 31 14:06:08 2017 -0700
committer Andreas Gampe <agampe@google.com> Mon Apr 03 13:43:53 2017 -0700
tree 2b47332f81db1bfdf2070410e677359fb5f2f4c8
parent 10b407e05667b6c89d682934b45e5768b2f40de6

CTS: JVMTI AOSP compatibility shim

Compatibility issues.

Bug: 32072923
Test: m cts
Merged-In: Ieb1d31c09e642d719929e4369dc8b4d316842b4a
Change-Id: I8ea70aeec30c3c43ca55637f47528c48bc2e3ae2

hostsidetests/jvmti/base/host/src/android/jvmti/cts/JvmtiHostTest.java

diff --git a/hostsidetests/jvmti/base/host/src/android/jvmti/cts/JvmtiHostTest.java b/hostsidetests/jvmti/base/host/src/android/jvmti/cts/JvmtiHostTest.java
index 326ff96..f2119c6 100644
--- a/hostsidetests/jvmti/base/host/src/android/jvmti/cts/JvmtiHostTest.java
+++ b/hostsidetests/jvmti/base/host/src/android/jvmti/cts/JvmtiHostTest.java
@@ -132,13 +132,22 @@
             }
         }
 
+        File getTestFile(String filename) throws java.io.FileNotFoundException {
+            File testFile = new File(mBuildHelper.getTestsDir(), filename);
+            if (!testFile.exists()) {
+                throw new java.io.FileNotFoundException(String.format(
+                        "Compatibility test file %s does not exist", filename));
+            }
+            return testFile;
+        }
+
         String installLibToDataData(String dataData, String library) throws Exception {
             ZipFile zf = null;
             File tmpFile = null;
             try {
                 String libInDataData = dataData + "/" + library;
 
-                File apkFile = mBuildHelper.getTestFile(mApk);
+                File apkFile = getTestFile(mApk);
                 zf = new ZipFile(apkFile);
 
                 String libPathInApk = "lib/" + mAbi.getName() + "/" + library;

hostsidetests/jvmti/base/host/src/android/jvmti/cts/JvmtiPreparer.java

diff --git a/hostsidetests/jvmti/base/host/src/android/jvmti/cts/JvmtiPreparer.java b/hostsidetests/jvmti/base/host/src/android/jvmti/cts/JvmtiPreparer.java
index 1577ab3..2039b7b 100644
--- a/hostsidetests/jvmti/base/host/src/android/jvmti/cts/JvmtiPreparer.java
+++ b/hostsidetests/jvmti/base/host/src/android/jvmti/cts/JvmtiPreparer.java
@@ -32,9 +32,9 @@
     }
 
     @Override
-    protected File getLocalPathForFilename(IBuildInfo arg0, String arg1, ITestDevice arg2)
+    protected File getLocalPathForFilename(IBuildInfo arg0, String arg1)
             throws TargetSetupError {
         storedApkName = arg1;
-        return super.getLocalPathForFilename(arg0, arg1, arg2);
+        return super.getLocalPathForFilename(arg0, arg1);
     }
 }