* enable java 1.6

* remove applypatch on x86

diff --git a/core/main.mk b/core/main.mk
index 97e49f4..df36b86 100644 (file)
--- a/core/main.mk
+++ b/core/main.mk
@@ -90,7 +90,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)
@@ -106,7 +106,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)
@@ -441,7 +441,6 @@ ifneq ($(words $(board_config_mk)),1)
 endif
 include $(board_config_mk)
 TARGET_DEVICE_DIR := $(patsubst %/,%,$(dir $(board_config_mk)))
-board_config_mk :=
 
 # Clean up/verify variables defined by the board config file.
 TARGET_BOOTLOADER_BOARD_NAME := $(strip $(TARGET_BOOTLOADER_BOARD_NAME))
@@ -449,6 +448,7 @@ TARGET_CPU_ABI := $(strip $(TARGET_CPU_ABI))
 ifeq ($(TARGET_CPU_ABI),)
   $(error No TARGET_CPU_ABI defined by board config: $(board_config_mk))
 endif
+board_config_mk :=
 
 #
 # Include all of the makefiles in the system

diff --git a/tools/applypatch/Android.mk b/tools/applypatch/Android.mk
index 5796cef..4158e5c 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
 
 include $(BUILD_HOST_EXECUTABLE)
 
+endif  # !TARGET_ARCH
 endif  # !TARGET_SIMULATOR