Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit df6cb282 authored by Tamas Berghammer's avatar Tamas Berghammer
Browse files

Add flag to "am start" to enable native debugging 

Specifying the new flag will enable several features in the runtime
required by the native debugger to debug Java and C++ code at the same
time.

The enabled features:
* Force JIT (never use the interpreter)
* Debug info generation
* Disbale some optimizations

Change-Id: Iaf5ab649715a0c274bd1b0fc64e483705da53cd0
parent b61437de

cmds/am/src/com/android/commands/am/Am.java

+4 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ public class Am extends BaseCommand { 
        PrintWriter pw = new PrintWriter(out);

        pw.println(

                "usage: am [subcommand] [options]\n" +

                "usage: am start [-D] [-W] [-P <FILE>] [--start-profiler <FILE>]\n" +

                "usage: am start [-D] [-N] [-W] [-P <FILE>] [--start-profiler <FILE>]\n" +

                "               [--sampling INTERVAL] [-R COUNT] [-S]\n" +

                "               [--track-allocation] [--user <USER_ID> | current] <INTENT>\n" +

                "       am startservice [--user <USER_ID> | current] <INTENT>\n" +
@@ -180,6 +180,7 @@ public class Am extends BaseCommand { 
                "\n" +

                "am start: start an Activity.  Options are:\n" +

                "    -D: enable debugging\n" +

                "    -N: enable native debugging\n" +

                "    -W: wait for launch to complete\n" +

                "    --start-profiler <FILE>: start profiler and send results to <FILE>\n" +

                "    --sampling INTERVAL: use sample profiling with INTERVAL microseconds\n" +
@@ -473,6 +474,8 @@ public class Am extends BaseCommand { 
            public boolean handleOption(String opt, ShellCommand cmd) {

                if (opt.equals("-D")) {

                    mStartFlags |= ActivityManager.START_FLAG_DEBUG;

                } else if (opt.equals("-N")) {

                    mStartFlags |= ActivityManager.START_FLAG_NATIVE_DEBUGGING;

                } else if (opt.equals("-W")) {

                    mWaitOption = true;

                } else if (opt.equals("-P")) {

core/java/android/app/ActivityManager.java

+7 −0
Original line number Diff line number Diff line
@@ -244,6 +244,13 @@ public class ActivityManager { 
     */

    public static final int START_FLAG_TRACK_ALLOCATION = 1<<2;



    /**

     * Flag for IActivityManaqer.startActivity: launch the app with

     * native debugging support.

     * @hide

     */

    public static final int START_FLAG_NATIVE_DEBUGGING = 1<<3;



    /**

     * Result for IActivityManaqer.broadcastIntent: success!

     * @hide

core/java/android/os/Process.java

+6 −0
Original line number Diff line number Diff line
@@ -647,6 +647,12 @@ public class Process { 
            if ((debugFlags & Zygote.DEBUG_GENERATE_DEBUG_INFO) != 0) {

                argsForZygote.add("--generate-debug-info");

            }

            if ((debugFlags & Zygote.DEBUG_ALWAYS_JIT) != 0) {

                argsForZygote.add("--always-jit");

            }

            if ((debugFlags & Zygote.DEBUG_NATIVE_DEBUGGABLE) != 0) {

                argsForZygote.add("--native-debuggable");

            }

            if ((debugFlags & Zygote.DEBUG_ENABLE_ASSERT) != 0) {

                argsForZygote.add("--enable-assert");

            }

core/java/com/android/internal/os/Zygote.java

+4 −0
Original line number Diff line number Diff line
@@ -41,6 +41,10 @@ public final class Zygote { 
    public static final int DEBUG_ENABLE_JNI_LOGGING = 1 << 4;

    /** Force generation of native debugging information. */

    public static final int DEBUG_GENERATE_DEBUG_INFO = 1 << 5;

    /** Always use JIT-ed code. */

    public static final int DEBUG_ALWAYS_JIT = 1 << 6;

    /** Make the code debuggable with turning off some optimizations. */

    public static final int DEBUG_NATIVE_DEBUGGABLE = 1 << 7;



    /** No external storage should be mounted. */

    public static final int MOUNT_EXTERNAL_NONE = 0;

core/java/com/android/internal/os/ZygoteConnection.java

+4 −0
Original line number Diff line number Diff line
@@ -434,6 +434,10 @@ class ZygoteConnection { 
                    debugFlags |= Zygote.DEBUG_ENABLE_CHECKJNI;

                } else if (arg.equals("--generate-debug-info")) {

                    debugFlags |= Zygote.DEBUG_GENERATE_DEBUG_INFO;

                } else if (arg.equals("--always-jit")) {

                    debugFlags |= Zygote.DEBUG_ALWAYS_JIT;

                } else if (arg.equals("--native-debuggable")) {

                    debugFlags |= Zygote.DEBUG_NATIVE_DEBUGGABLE;

                } else if (arg.equals("--enable-jni-logging")) {

                    debugFlags |= Zygote.DEBUG_ENABLE_JNI_LOGGING;

                } else if (arg.equals("--enable-assert")) {