am efe01cc6: am 3976a569: Merge "Replace --include-cfi with --generate-debug-info."

* commit 'efe01cc62ee49f57c34726ec9c13ddaa9c1b1d8b':
  Replace --include-cfi with --generate-debug-info.

diff --cc core/java/android/os/Process.java
Simple merge

diff --cc core/java/com/android/internal/os/Zygote.java
index 1e7ee5a,822117c..544e1e4
--- 1/core/java/com/android/internal/os/Zygote.java
--- 2/core/java/com/android/internal/os/Zygote.java
+++ b/core/java/com/android/internal/os/Zygote.java
@@@ -40,13 -40,18 +40,13 @@@ public final class Zygote 
      public static final int DEBUG_ENABLE_JNI_LOGGING = 1 << 4;
      /** enable the JIT compiler */
      public static final int DEBUG_ENABLE_JIT         = 1 << 5;
-     /** Force generation of CFI code */
-     public static final int DEBUG_GENERATE_CFI       = 1 << 6;
+     /** Force generation of native debugging information. */
+     public static final int DEBUG_GENERATE_DEBUG_INFO = 1 << 6;
  
 -
      /** No external storage should be mounted. */
      public static final int MOUNT_EXTERNAL_NONE = 0;
 -    /** Single-user external storage should be mounted. */
 -    public static final int MOUNT_EXTERNAL_SINGLEUSER = 1;
 -    /** Multi-user external storage should be mounted. */
 -    public static final int MOUNT_EXTERNAL_MULTIUSER = 2;
 -    /** All multi-user external storage should be mounted. */
 -    public static final int MOUNT_EXTERNAL_MULTIUSER_ALL = 3;
 +    /** Default user-specific external storage should be mounted. */
 +    public static final int MOUNT_EXTERNAL_DEFAULT = 1;
  
      private static final ZygoteHooks VM_HOOKS = new ZygoteHooks();
  

diff --cc core/java/com/android/internal/os/ZygoteConnection.java
Simple merge

diff --cc core/jni/AndroidRuntime.cpp
index 7c2b28d,6e8da65..2c35a8b
--- 1/core/jni/AndroidRuntime.cpp
--- 2/core/jni/AndroidRuntime.cpp
+++ b/core/jni/AndroidRuntime.cpp
@@@ -871,21 -873,17 +871,21 @@@ int AndroidRuntime::startVm(JavaVM** pJ
      snprintf(cpuAbiListBuf, sizeof(cpuAbiListBuf), "--cpu-abilist=%s", propBuf);
      addOption(cpuAbiListBuf);
  
 +    // Dalvik-cache pruning counter.
 +    parseRuntimeOption("dalvik.vm.zygote.max-boot-retry", cachePruneBuf,
 +                       "-Xzygote-max-boot-retry=");
 +
      /*
-      * When running with debug.gencfi, add --include-cfi to the compiler options so that the boot
-      * image, if it is compiled on device, will include CFI info, as well as other compilations
-      * started by the runtime.
+      * When running with debug.generate-debug-info, add --generate-debug-info to
+      * the compiler options so that the boot image, if it is compiled on device,
+      * will include native debugging information.
       */
-     property_get("debug.gencfi", propBuf, "");
+     property_get("debug.generate-debug-info", propBuf, "");
      if (strcmp(propBuf, "true") == 0) {
          addOption("-Xcompiler-option");
-         addOption("--include-cfi");
+         addOption("--generate-debug-info");
          addOption("-Ximage-compiler-option");
-         addOption("--include-cfi");
+         addOption("--generate-debug-info");
      }
  
      initArgs.version = JNI_VERSION_1_4;

diff --cc services/core/java/com/android/server/am/ActivityManagerService.java
Simple merge