diff options
| author | Ben Cheng <bccheng@google.com> | 2013-03-11 15:24:30 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-03-11 15:24:30 -0700 |
| commit | 65ddab7c6150a7f86839d046f9f63a9a5cbb220c (patch) | |
| tree | 177ac37c59e8e057f70fc1dd4baefd6703ffe5db | |
| parent | 4f1a0c315367150292da970280636d0fab54e848 (diff) | |
| parent | 3711df3c1fbd2d310eb4f742a539913a3b5ce0af (diff) | |
| download | valgrind-65ddab7c6150a7f86839d046f9f63a9a5cbb220c.tar.gz | |
am 3711df3c: Merge "Fix full_x86-eng build."
* commit '3711df3c1fbd2d310eb4f742a539913a3b5ce0af':
Fix full_x86-eng build.
| -rw-r--r-- | main/Android.mk | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/main/Android.mk b/main/Android.mk index 3c6925b81..8ac1d800a 100644 --- a/main/Android.mk +++ b/main/Android.mk @@ -49,12 +49,13 @@ ANDROID_HARDWARE := ANDROID_HARDWARE_nexus_7 else ifeq ($(TARGET_BOOTLOADER_BOARD_NAME),MAKO) ANDROID_HARDWARE := ANDROID_HARDWARE_nexus_4 endif -common_cflags += -D$(ANDROID_HARDWARE) else tool_ldflags := -static -Wl,-Ttext=0x38000000 -nodefaultlibs -nostartfiles -u _start -e_start endif +common_cflags += -D$(ANDROID_HARDWARE) + preload_ldflags := -nodefaultlibs -Wl,-z,interpose,-z,initfirst # Remove this when the all toolchains are GCC 4.4 ifeq ($(TARGET_ARCH),arm) @@ -257,7 +258,9 @@ LOCAL_C_INCLUDES := $(common_includes) LOCAL_LDFLAGS := $(vex_ldflags) +# TODO: split asflags out from cflags. LOCAL_CFLAGS := $(common_cflags) +LOCAL_ASFLAGS := $(common_cflags) include $(BUILD_STATIC_LIBRARY) |