summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2014-09-12 05:45:07 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-09-12 05:45:07 +0000
commitc846e61639c3808889ac394366dd4db5379a3b88 (patch)
treec308f1c266a4f6e94e8162a72a2162f835bc559a /include
parent4c4b3b8f78891d37d04430622bffc1dc2df361f2 (diff)
parent0836f2f08b5bfc5359a1de833a6f55fc596fde08 (diff)
downloadframeworks_base-c846e61639c3808889ac394366dd4db5379a3b88.zip
frameworks_base-c846e61639c3808889ac394366dd4db5379a3b88.tar.gz
frameworks_base-c846e61639c3808889ac394366dd4db5379a3b88.tar.bz2
am a38e59b1: am 683872af: Merge "Clean entire arg block when setting process name." into lmp-dev
* commit 'a38e59b1b4164a33c38fc522e56601d886c49833': Clean entire arg block when setting process name.
Diffstat (limited to 'include')
-rw-r--r--include/android_runtime/AndroidRuntime.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/include/android_runtime/AndroidRuntime.h b/include/android_runtime/AndroidRuntime.h
index 51e47e6..f3cfd97 100644
--- a/include/android_runtime/AndroidRuntime.h
+++ b/include/android_runtime/AndroidRuntime.h
@@ -45,6 +45,7 @@ public:
};
void setArgv0(const char* argv0);
+ void addOption(const char* optionString, void* extra_info = NULL);
/**
* Register a set of methods in the specified class.
@@ -63,8 +64,6 @@ public:
*/
static jclass findClass(JNIEnv* env, const char* className);
- int addVmArguments(int argc, const char* const argv[]);
-
void start(const char *classname, const Vector<String8>& options);
void exit(int code);
@@ -116,7 +115,6 @@ public:
private:
static int startReg(JNIEnv* env);
- void addOption(const char* optionString, void* extra_info = NULL);
bool parseRuntimeOption(const char* property,
char* buffer,
const char* runtimeArg,