Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1252)

Unified Diff: testing/android/native_test/java/src/org/chromium/native_test/NativeTest.java

Issue 2043803003: 👔 Reland #2: Move side-loaded test data /sdcard -> /sdcard/gtestdata (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase atop https://codereview.chromium.org/2041723006 Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: testing/android/native_test/java/src/org/chromium/native_test/NativeTest.java
diff --git a/testing/android/native_test/java/src/org/chromium/native_test/NativeTest.java b/testing/android/native_test/java/src/org/chromium/native_test/NativeTest.java
index 2f787c97c5128afeea72f281987d8c07fd1b5e74..537c5efc777aab2ba1c4f86cf3445fc5623661be 100644
--- a/testing/android/native_test/java/src/org/chromium/native_test/NativeTest.java
+++ b/testing/android/native_test/java/src/org/chromium/native_test/NativeTest.java
@@ -16,6 +16,7 @@ import org.chromium.base.CommandLine;
import org.chromium.base.Log;
import org.chromium.base.annotations.JNINamespace;
import org.chromium.base.multidex.ChromiumMultiDexInstaller;
+import org.chromium.base.test.util.UrlUtils;
import org.chromium.test.reporter.TestStatusReporter;
import java.io.File;
@@ -154,7 +155,7 @@ public class NativeTest {
private void runTests(Activity activity) {
nativeRunTests(mCommandLineFlags.toString(), mCommandLineFilePath, mStdoutFilePath,
- mStdoutFifo, activity.getApplicationContext());
+ mStdoutFifo, activity.getApplicationContext(), UrlUtils.getIsolatedTestRoot());
activity.finish();
mReporter.testRunFinished(Process.myPid());
}
@@ -167,5 +168,5 @@ public class NativeTest {
}
private native void nativeRunTests(String commandLineFlags, String commandLineFilePath,
- String stdoutFilePath, boolean stdoutFifo, Context appContext);
+ String stdoutFilePath, boolean stdoutFifo, Context appContext, String testDataDir);
}

Powered by Google App Engine
This is Rietveld 408576698