Add android_launch_app script to allow command line options to be passed to the sampleApp when star…

platform_tools/android/app/jni/com_skia_SkiaSampleRenderer.cpp

Index: platform_tools/android/app/jni/com_skia_SkiaSampleRenderer.cpp
diff --git a/platform_tools/android/app/jni/com_skia_SkiaSampleRenderer.cpp b/platform_tools/android/app/jni/com_skia_SkiaSampleRenderer.cpp
index 049db975969095293b754273e83efbd28c1228cb..d6268270a5a3ced51ea05175796aa90de413c03b 100644
--- a/platform_tools/android/app/jni/com_skia_SkiaSampleRenderer.cpp
+++ b/platform_tools/android/app/jni/com_skia_SkiaSampleRenderer.cpp
@@ -172,7 +172,7 @@ static jmethodID GetJMethod(JNIEnv* env, jclass clazz, const char name[],
 }
 
 JNIEXPORT void JNICALL Java_com_skia_SkiaSampleRenderer_init(JNIEnv* env,
-        jobject thiz, jobject jsampleActivity, jint msaaSampleCount)
+        jobject thiz, jobject jsampleActivity, jstring cmdLineFlags, jint msaaSampleCount)
 {
     // setup jni hooks to the java activity
     gActivityGlue.m_env = env;
@@ -194,15 +194,17 @@ JNIEXPORT void JNICALL Java_com_skia_SkiaSampleRenderer_init(JNIEnv* env,
     env->DeleteLocalRef(clazz);
 
     application_init();
-    SkTArray<const char*> args;
 
-    args.push_back("SampleApp");
-    // TODO: push ability to select skp dir into the UI
-    args.push_back("--pictureDir");
-    args.push_back("/sdcard/skiabot/skia_skp");
+    const char* flags = env->GetStringUTFChars(cmdLineFlags, JNI_FALSE);
+    SkTArray<SkString> flagEntries;
+    SkStrSplit(flags, " ", &flagEntries);

[tomhudson, 2015/05/08 21:08:57]

Worth announcing somewhere that we now need to explicitly supply --pictureDir
and --resourcePath?

I see you add them if *nothing* was provided, but if we now want to provide any
other flags we must also provide those two?

[djsollen, 2015/05/11 12:41:17]

I've already updated the markdown docs.

 
-    args.push_back("--resourcePath");
-    args.push_back("/data/local/tmp/skia/resources/");
+    SkTArray<const char*> args;
+    args.push_back("SampleApp");
+    for (int i = 0; i < flagEntries.count(); i++) {
+      SkDebugf(flagEntries[i].c_str());
+      args.push_back(flagEntries[i].c_str());
+    }
 
     SkString msaaSampleCountString;
     if (msaaSampleCount > 0) {
@@ -211,7 +213,14 @@ JNIEXPORT void JNICALL Java_com_skia_SkiaSampleRenderer_init(JNIEnv* env,
         args.push_back(msaaSampleCountString.c_str());
     }
 
-    gWindow = new SampleWindow(NULL, args.count(), const_cast<char**>(args.begin()), NULL);
+    if (gWindow) {

[tomhudson, 2015/05/08 21:08:58]

How could this error mode happen?

[djsollen, 2015/05/11 12:41:17]

Android allows views to be recreated when the app goes out of focus and then
comes back into focus.  However, we can't regenerate our window when that
happens or things like the command line parser crash as they can only be called
1x.

+      SkDebugf("The sample window already exists.");
+    } else {
+      gWindow = new SampleWindow(NULL, args.count(), const_cast<char**>(args.begin()), NULL);
+    }
+
+    // cleanup the command line flags
+    env->ReleaseStringUTFChars(cmdLineFlags, flags);
 
     // send the list of slides up to the activity
     const int slideCount = gWindow->sampleCount();