summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2014-04-09 14:06:10 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-04-09 14:06:10 +0000
commit8ee0b48d607fd6afc5e75f56bdadce19272c60ff (patch)
treed021d0fbdebf4b9d1607a359f69adb3a51283034 /include
parenta981e3b01ae6af2b67e582f0d1cbb95560d05626 (diff)
parent97175deb446cdaca7f3910b71940cb443bda3cc4 (diff)
downloadframeworks_base-8ee0b48d607fd6afc5e75f56bdadce19272c60ff.zip
frameworks_base-8ee0b48d607fd6afc5e75f56bdadce19272c60ff.tar.gz
frameworks_base-8ee0b48d607fd6afc5e75f56bdadce19272c60ff.tar.bz2
am 97175deb: am 3856a219: am cecfb94f: Merge "Clean up argc / argv processing for runtime args."
* commit '97175deb446cdaca7f3910b71940cb443bda3cc4': 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);