summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2014-04-09 14:02:08 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-04-09 14:02:08 +0000
commit97175deb446cdaca7f3910b71940cb443bda3cc4 (patch)
tree7f316f4f074f8427d3046f99b683b97136cc3b14 /include
parentdc7eb9c947f36cbd34021663845bcbb090c3169d (diff)
parent3856a219fa414ee53c5ef3a0c35dae35e2ca80b1 (diff)
downloadframeworks_base-97175deb446cdaca7f3910b71940cb443bda3cc4.zip
frameworks_base-97175deb446cdaca7f3910b71940cb443bda3cc4.tar.gz
frameworks_base-97175deb446cdaca7f3910b71940cb443bda3cc4.tar.bz2
am 3856a219: am cecfb94f: Merge "Clean up argc / argv processing for runtime args."
* commit '3856a219fa414ee53c5ef3a0c35dae35e2ca80b1': Clean up argc / argv processing for runtime args.
Diffstat (limited to 'include')
-rw-r--r--include/android_runtime/AndroidRuntime.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/include/android_runtime/AndroidRuntime.h b/include/android_runtime/AndroidRuntime.h
index 6f2af90..3dfdb46 100644
--- a/include/android_runtime/AndroidRuntime.h
+++ b/include/android_runtime/AndroidRuntime.h
@@ -55,8 +55,7 @@ public:
/**
* Call a class's static main method with the given arguments,
*/
- status_t callMain(const char* className, jclass clazz, int argc,
- const char* const argv[]);
+ status_t callMain(const String8& className, jclass clazz, const Vector<String8>& args);
/**
* Find a class, with the input either of the form
@@ -66,7 +65,7 @@ public:
int addVmArguments(int argc, const char* const argv[]);
- void start(const char *classname, const char* options);
+ void start(const char *classname, const Vector<String8>& options);
void exit(int code);