From e510155dbdebb50048632810b1735d69f9e72638 Mon Sep 17 00:00:00 2001 From: Sebastien Hertz Date: Mon, 10 Aug 2015 18:55:34 +0200 Subject: Allow debugging only for apps forked from zygote 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 --- include/android_runtime/AndroidRuntime.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include/android_runtime') 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 mOptions; bool mExitWithoutCleanup; -- cgit v1.1