commit 4b7692c57a135501e0494cfbfd905e084d2fb79f
author Elliott Hughes <enh@google.com> Fri Feb 12 13:43:14 2010 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Fri Feb 12 13:43:14 2010 -0800
tree ec40cb56931944827c433ccb7b70a3973a68849d
parent e3b632ab990be54982fec0e73a7f1a5abab7fe58
parent 6461d8fe30e94c08d10ccd40c9ceeb83b9c43b7b

Merge "Remove some potential test flakiness." into dalvik-dev

dalvik/src/main/java/dalvik/system/Zygote.java

diff --git a/dalvik/src/main/java/dalvik/system/Zygote.java b/dalvik/src/main/java/dalvik/system/Zygote.java
index 13e7561..4f83d28 100644
--- a/dalvik/src/main/java/dalvik/system/Zygote.java
+++ b/dalvik/src/main/java/dalvik/system/Zygote.java
@@ -35,6 +35,8 @@
     public static final int DEBUG_ENABLE_CHECKJNI   = 1 << 1;
     /** enable Java programming language "assert" statements */
     public static final int DEBUG_ENABLE_ASSERT     = 1 << 2;
+    /** disable the JIT compiler */
+    public static final int DEBUG_ENABLE_SAFEMODE   = 1 << 3;
 
     private Zygote() {}
 
@@ -117,4 +119,3 @@
         return forkAndSpecialize(uid, gid, gids, debugFlags, rlimits);
     }
 }
-

luni/src/main/native/java_net_NetworkInterface.cpp

diff --git a/luni/src/main/native/java_net_NetworkInterface.cpp b/luni/src/main/native/java_net_NetworkInterface.cpp
index 420c045..1a72710 100644
--- a/luni/src/main/native/java_net_NetworkInterface.cpp
+++ b/luni/src/main/native/java_net_NetworkInterface.cpp
@@ -30,7 +30,7 @@
 
 #include <net/if.h> // Note: Can't appear before <sys/socket.h> on OS X.
 
-#ifdef ANDROID
+#ifdef HAVE_ANDROID_OS
 #include "ifaddrs-android.h"
 #else
 #include <ifaddrs.h>