* enable java 1.6

* remove applypatch on x86

diff --git a/core/main.mk b/core/main.mk
index 386c0c9..ca67df1 100644 (file)
--- a/core/main.mk
+++ b/core/main.mk
@@ -96,7 +96,7 @@ endif
 ifneq ($(HOST_OS),windows)
 
 # Check for the correct version of java
-java_version := $(shell java -version 2>&1 | head -n 1 | grep '[ "]1\.5[\. "$$]')
+java_version := $(shell java -version 2>&1 | head -n 1 | grep '[ "]1\.[56][\. "$$]')
 ifeq ($(strip $(java_version)),)
 $(info ************************************************************)
 $(info You are attempting to build with the incorrect version)
@@ -112,7 +112,7 @@ $(error stop)
 endif
 
 # Check for the correct version of javac
-javac_version := $(shell javac -version 2>&1 | head -n 1 | grep '[ "]1\.5[\. "$$]')
+javac_version := $(shell javac -version 2>&1 | head -n 1 | grep '[ "]1\.[56][\. "$$]')
 ifeq ($(strip $(javac_version)),)
 $(info ************************************************************)
 $(info You are attempting to build with the incorrect version)

diff --git a/tools/applypatch/Android.mk b/tools/applypatch/Android.mk
index d20d6c8..9088540 100644 (file)
--- a/tools/applypatch/Android.mk
+++ b/tools/applypatch/Android.mk
@@ -13,6 +13,7 @@
 # limitations under the License.
 
 ifneq ($(TARGET_SIMULATOR),true)
+ifneq ($(TARGET_ARCH),x86)
 
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
@@ -56,4 +57,5 @@ LOCAL_STATIC_LIBRARIES += libz libbz
 
 include $(BUILD_HOST_EXECUTABLE)
 
+endif  # !TARGET_ARCH
 endif  # !TARGET_SIMULATOR