summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--linker/Android.mk6
-rw-r--r--linker/linker.h5
2 files changed, 11 insertions, 0 deletions
diff --git a/linker/Android.mk b/linker/Android.mk
index 00b5b0a..bf6b121 100644
--- a/linker/Android.mk
+++ b/linker/Android.mk
@@ -9,7 +9,13 @@ LOCAL_SRC_FILES:= \
debugger.c \
ba.c
+ifneq ($(TARGET_USES_2G_VM_SPLIT),true)
+LINKER_TEXT_BASE := 0xB0000100
+else
LINKER_TEXT_BASE := 0x70000100
+LOCAL_CFLAGS += -DVM_SPLIT_2G
+endif
+
# The maximum size set aside for the linker, from
# LINKER_TEXT_BASE rounded down to a megabyte.
diff --git a/linker/linker.h b/linker/linker.h
index d334ece..b831941 100644
--- a/linker/linker.h
+++ b/linker/linker.h
@@ -147,8 +147,13 @@ struct soinfo
extern soinfo libdl_info;
/* these must all be powers of two */
+#ifdef VM_SPLIT_2G
#define LIBBASE 0x40000000
#define LIBLAST 0x50000000
+#else
+#define LIBBASE 0x80000000
+#define LIBLAST 0x90000000
+#endif
#define LIBINC 0x00100000