Merge "emulator: Build emulator platform images as ARMv7-A"
diff --git a/core/config.mk b/core/config.mk
index 9b588cf..d953b1a 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -106,8 +106,8 @@
# Default is to prelink modules.
TARGET_PRELINK_MODULE := true
-# Default shell is ash. Other possible value is mksh.
-TARGET_SHELL := ash
+# Default shell is mksh. Other possible value is ash.
+TARGET_SHELL := mksh
# ###############################################################
# Include sub-configuration files
@@ -270,6 +270,12 @@
HOST_JDK_TOOLS_JAR:= $(shell $(BUILD_SYSTEM)/find-jdk-tools-jar.sh)
endif
+# Is the host JDK 64-bit version?
+HOST_JDK_IS_64BIT_VERSION :=
+ifneq ($(filter 64-Bit, $(shell java -version 2>&1)),)
+HOST_JDK_IS_64BIT_VERSION := true
+endif
+
# It's called md5 on Mac OS and md5sum on Linux
ifeq ($(HOST_OS),darwin)
MD5SUM:=md5 -q
diff --git a/core/main.mk b/core/main.mk
index 2ab9d72..ab49415 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -70,17 +70,6 @@
$(info Checking build tools versions...)
-ifeq ($(BUILD_OS),linux)
-build_arch := $(shell uname -m)
-ifneq (64,$(findstring 64,$(build_arch)))
-$(warning ************************************************************)
-$(warning You are attempting to build on a 32-bit system.)
-$(warning Only 64-bit build environments are supported beyond froyo/2.2.)
-$(warning ************************************************************)
-$(error stop)
-endif
-endif
-
ifneq ($(HOST_OS),windows)
ifneq ($(HOST_OS)-$(HOST_ARCH),darwin-ppc)
# check for a case sensitive file system
diff --git a/core/prelink-linux-arm.map b/core/prelink-linux-arm.map
index 7daaf98..eea399a 100644
--- a/core/prelink-linux-arm.map
+++ b/core/prelink-linux-arm.map
@@ -108,9 +108,9 @@
libaudioflinger.so 0xA8D00000 # [~1M]
# assorted system libraries
-libsqlite.so 0xA8B00000 # [~2M]
-libexpat.so 0xA8A00000 # [~1M]
-libwebcore.so 0xA8300000 # [~7M]
+libsqlite.so 0xA8B80000 # [~1.5M]
+libexpat.so 0xA8B00000 # [~0.5M]
+libwebcore.so 0xA8300000 # [~8M]
libbinder.so 0xA8200000 # [~1M]
libutils.so 0xA8100000 # [~1M]
libcameraservice.so 0xA8000000 # [~1M]
@@ -211,3 +211,7 @@
libzxing.so 0x9D000000 # [<64K] for goggles
libinterstitial.so 0x9CF00000 # [<64K] for goggles
liblept.so 0x9CA00000 # [~5M] for external/leptonica
+network.so 0x9C9C0000 # [~256K]
+health.so 0x9C980000 # [~256K]
+libglib.so 0x9C900000 # [~512K]
+libbtio.so 0x9C8E0000 # [~128K]