Fix full_x86-eng build.
[cherry-picked from internal master]
Change-Id: Ica412173eb34c7ec9911b36596f571a198a4df46
diff --git a/main/Android.mk b/main/Android.mk
index 3c6925b..8ac1d80 100644
--- a/main/Android.mk
+++ b/main/Android.mk
@@ -49,12 +49,13 @@
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_LDFLAGS := $(vex_ldflags)
+# TODO: split asflags out from cflags.
LOCAL_CFLAGS := $(common_cflags)
+LOCAL_ASFLAGS := $(common_cflags)
include $(BUILD_STATIC_LIBRARY)
