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

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

Issue 1926793002: 👔 Move side-loaded test data /sdcard -> /sdcard/gtestdata (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 7 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/NativeTestActivity.java
diff --git a/testing/android/native_test/java/src/org/chromium/native_test/NativeTestActivity.java b/testing/android/native_test/java/src/org/chromium/native_test/NativeTestActivity.java
index 00d5c7899f63cebbef09918e4cc341f32ed3cb3b..8ad3e1b6d01e4be417ba7fac3a0c5e2c0ec9affb 100644
--- a/testing/android/native_test/java/src/org/chromium/native_test/NativeTestActivity.java
+++ b/testing/android/native_test/java/src/org/chromium/native_test/NativeTestActivity.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;
@@ -137,7 +138,7 @@ public class NativeTestActivity extends Activity {
private void runTests() {
mReporter.testRunStarted(Process.myPid());
nativeRunTests(mCommandLineFlags.toString(), mCommandLineFilePath, mStdoutFilePath,
- mStdoutFifo, getApplicationContext());
+ mStdoutFifo, getApplicationContext(), UrlUtils.getIsolatedTestRoot());
jbudorick 2016/05/18 14:23:38 actually, rather than doing something with <meta-d
jbudorick 2016/05/23 17:27:31 Any thoughts on this?
finish();
mReporter.testRunFinished(Process.myPid());
}
@@ -150,5 +151,5 @@ public class NativeTestActivity extends Activity {
}
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