summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorSebastien Hertz <shertz@google.com>2015-08-10 18:55:34 +0200
committerWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2015-10-19 00:12:33 +0200
commite510155dbdebb50048632810b1735d69f9e72638 (patch)
tree068adab1d5aba8f3eb4132d8ff7004a34a9292f0 /include
parent38add157784a2bb5ddb13558573ece99229bb3b0 (diff)
downloadframeworks_base-e510155dbdebb50048632810b1735d69f9e72638.zip
frameworks_base-e510155dbdebb50048632810b1735d69f9e72638.tar.gz
frameworks_base-e510155dbdebb50048632810b1735d69f9e72638.tar.bz2
Allow debugging only for apps forked from zygoteHEADmaster
When starting the runtime from app_process, we only pass JDWP options if starting zygote. It prevents from opening a JDWP connection in non-zygote programs while Android apps (forked from zygote) remain debuggable. Bug: 23050463 (cherry picked from commit 7a09b8322cab26d6e3da1362d3c74964ae66b5d4) Change-Id: Ib5b6d3bc4d45389993c3c54226df5a7b72479d19 Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>
Diffstat (limited to 'include')
-rw-r--r--include/android_runtime/AndroidRuntime.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/android_runtime/AndroidRuntime.h b/include/android_runtime/AndroidRuntime.h
index 0b3ce9a..e8e869d 100644
--- a/include/android_runtime/AndroidRuntime.h
+++ b/include/android_runtime/AndroidRuntime.h
@@ -64,7 +64,7 @@ public:
int addVmArguments(int argc, const char* const argv[]);
- void start(const char *classname, const char* options);
+ void start(const char *classname, const char* options, bool zygote);
void exit(int code);
@@ -116,7 +116,7 @@ public:
private:
static int startReg(JNIEnv* env);
void parseExtraOpts(char* extraOptsBuf);
- int startVm(JavaVM** pJavaVM, JNIEnv** pEnv);
+ int startVm(JavaVM** pJavaVM, JNIEnv** pEnv, bool zygote);
Vector<JavaVMOption> mOptions;
bool mExitWithoutCleanup;