Merge prelink map tweaks
Change-Id: I11895037a7c5768f48f18b63274daaa4d25bc681
diff --git a/core/combo/TARGET_linux-x86.mk b/core/combo/TARGET_linux-x86.mk
index 8a2f841..989f7e3 100644
--- a/core/combo/TARGET_linux-x86.mk
+++ b/core/combo/TARGET_linux-x86.mk
@@ -75,11 +75,29 @@
KERNEL_HEADERS := $(KERNEL_HEADERS_COMMON) $(KERNEL_HEADERS_ARCH)
TARGET_GLOBAL_CFLAGS += \
+ -O2 \
-Ulinux \
- -m32 \
+ -Wa,--noexecstack \
+ -Werror=format-security \
+ -Wstrict-aliasing=2 \
-fPIC \
+ -ffunction-sections \
+ -finline-functions \
+ -finline-limit=300 \
+ -fno-inline-functions-called-once \
+ -fno-short-enums \
+ -fstrict-aliasing \
+ -funswitch-loops \
+ -funwind-tables \
-include $(call select-android-config-h,target_linux-x86)
+TARGET_GLOBAL_CFLAGS += -fstack-protector
+
+# Needs to be added for RELEASE
+#TARGET_GLOBAL_CFLAGS += \
+# -DNDEBUG
+
+
# Fix this after ssp.c is fixed for x86
# TARGET_GLOBAL_CFLAGS += -fstack-protector
@@ -94,8 +112,10 @@
TARGET_GLOBAL_CFLAGS += -mbionic
TARGET_GLOBAL_CFLAGS += -D__ANDROID__
-TARGET_GLOBAL_LDFLAGS += -m32
+TARGET_GLOBAL_LDFLAGS += -m32
+TARGET_GLOBAL_LDFLAGS += -Wl,-z,noexecstack
+TARGET_GLOBAL_LDFLAGS += -Wl,--gc-sections
TARGET_C_INCLUDES := \
$(libc_root)/arch-x86/include \
diff --git a/core/config.mk b/core/config.mk
index 9b588cf..7f484aa 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
diff --git a/core/droiddoc.mk b/core/droiddoc.mk
index 87576dc..60b9c83 100644
--- a/core/droiddoc.mk
+++ b/core/droiddoc.mk
@@ -163,7 +163,7 @@
LD_LIBRARY_PATH=$(HOST_OUT_SHARED_LIBRARIES) \
javadoc \
\@$(PRIVATE_SRC_LIST_FILE) \
- -J-Xmx768m \
+ -J-Xmx1280m \
-J-Djava.library.path=$(HOST_OUT_SHARED_LIBRARIES) \
$(PRIVATE_PROFILING_OPTIONS) \
-quiet \
diff --git a/core/prelink-linux-arm.map b/core/prelink-linux-arm.map
index f1e9520..11fa62e 100644
--- a/core/prelink-linux-arm.map
+++ b/core/prelink-linux-arm.map
@@ -109,8 +109,8 @@
# assorted system libraries
libsqlite.so 0xA8B80000 # [~1.5M]
-libexpat.so 0xA8B00000 # [~.5M]
-libwebcore.so 0xA8300000 # [~8M]
+libexpat.so 0xA8B00000 # [~0.5M]
+libwebcore.so 0xA8300000 # [~7M]
libbinder.so 0xA8200000 # [~1M]
libutils.so 0xA8100000 # [~1M]
libcameraservice.so 0xA8000000 # [~1M]
@@ -211,5 +211,3 @@
libzxing.so 0x9D000000 # [<64K] for goggles
libinterstitial.so 0x9CF00000 # [<64K] for goggles
liblept.so 0x9CA00000 # [~5M] for external/leptonica
-network.so 0x9C9C0000 # [~0.25M]
-libglib.so 0x9C800000 # [~1.75M]
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 2f57cf7..b38efe3 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -41,7 +41,7 @@
# which is the version that we reveal to the end user.
# Update this value when the platform version changes (rather
# than overriding it somewhere else). Can be an arbitrary string.
- PLATFORM_VERSION := AOSP
+ PLATFORM_VERSION := 3.1.4.1.5.9.2.6.5
endif
ifeq "" "$(PLATFORM_SDK_VERSION)"
diff --git a/envsetup.sh b/envsetup.sh
index cefe8ba..c94ca7b 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -433,12 +433,6 @@
add_lunch_combo full_x86-eng
add_lunch_combo vbox_x86-eng
-# if we're on linux, add the simulator. There is a special case
-# in lunch to deal with the simulator
-if [ "$(uname)" = "Linux" ] ; then
- add_lunch_combo simulator
-fi
-
function print_lunch_menu()
{
local uname=$(uname)