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

 
 /*
  * Copyright 2011 Skia
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "com_skia_SkiaSampleRenderer.h"
 
 #include "SampleApp.h"
@@ skipping 154 matching lines @@
 
 static jmethodID GetJMethod(JNIEnv* env, jclass clazz, const char name[],
         const char signature[])
 {
     jmethodID m = env->GetMethodID(clazz, name, signature);
     if (!m) SkDebugf("Could not find Java method %s\n", name);
     return m;
 }
 
 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;
     jclass clazz = env->FindClass("com/skia/SkiaSampleActivity");
     gActivityGlue.m_obj = env->NewWeakGlobalRef(jsampleActivity);
     gActivityGlue.m_setTitle = GetJMethod(env, clazz, "setTitle", "(Ljava/lang/CharSequence;)V");
     gActivityGlue.m_setSlideList = GetJMethod(env, clazz, "setSlideList", "([Ljava/lang/String;)V");
     gActivityGlue.m_addToDownloads = GetJMethod(env, clazz, "addToDownloads",
             "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V");
     env->DeleteLocalRef(clazz);
 
     // setup jni hooks to the java renderer
     clazz = env->FindClass("com/skia/SkiaSampleRenderer");
     gWindowGlue.m_obj = env->NewWeakGlobalRef(thiz);
     gWindowGlue.m_inval = GetJMethod(env, clazz, "requestRender", "()V");
     gWindowGlue.m_queueSkEvent = GetJMethod(env, clazz, "queueSkEvent", "()V");
     gWindowGlue.m_startTimer = GetJMethod(env, clazz, "startTimer", "(I)V");
     gWindowGlue.m_getMSAASampleCount = GetJMethod(env, clazz, "getMSAASampleCount", "()I");
     env->DeleteLocalRef(clazz);
 
     application_init();
+
+    const char* flags = env->GetStringUTFChars(cmdLineFlags, JNI_FALSE);
+    SkTArray<SkString> flagEntries;
+    SkStrSplit(flags, " ", &flagEntries);
+
     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");
-
-    args.push_back("--resourcePath");
-    args.push_back("/data/local/tmp/skia/resources/");
+    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) {
         args.push_back("--msaa");
         msaaSampleCountString.appendS32(static_cast<uint32_t>(msaaSampleCount));
         args.push_back(msaaSampleCountString.c_str());
     }
 
-    gWindow = new SampleWindow(NULL, args.count(), const_cast<char**>(args.begin()), NULL);
+    if (gWindow) {
+        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();
     jobjectArray slideList = env->NewObjectArray(slideCount, env->FindClass("java/lang/String"), env->NewStringUTF(""));
     for (int i = 0; i < slideCount; i++) {
         jstring slideTitle = env->NewStringUTF(gWindow->getSampleTitle(i).c_str());
         env->SetObjectArrayElement(slideList, i, slideTitle);
         env->DeleteLocalRef(slideTitle);
     }
     env->CallVoidMethod(gActivityGlue.m_obj, gActivityGlue.m_setSlideList, slideList);
@@ skipping 123 matching lines @@
         JNIEnv* env, jobject thiz)
 {
     gWindow->saveToPdf();
 }
 
 JNIEXPORT void JNICALL Java_com_skia_SkiaSampleRenderer_postInval(
         JNIEnv* env, jobject thiz)
 {
     gWindow->postInvalDelay();
 }