commit f40229fd727b0989710df18109fe0d84b7da654a
author Nick Kralevich <nnk@google.com> Thu Oct 24 22:19:36 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Oct 24 22:19:37 2013 +0000
tree c88112c66c8a58599ffca1ad81df59e56e71b05e
parent 76a1918e6aa5732e2cb1ba3081177f37d5c8761b
parent 24dcba03451cf3d9f16380ec0f2cc416fcbc1883

Merge "Add -Wl,--no-fatal-warnings to x86 build (continued)"

vm/Android.mk

diff --git a/vm/Android.mk b/vm/Android.mk
index 91356d2..a5c58ad 100644
--- a/vm/Android.mk
+++ b/vm/Android.mk
@@ -71,6 +71,9 @@
 # TODO: split out the asflags.
 LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
 LOCAL_MODULE := libdvm_assert
+ifeq ($(TARGET_ARCH),x86)
+LOCAL_LDFLAGS += -Wl,--no-fatal-warnings
+endif
 include $(BUILD_SHARED_LIBRARY)
 
 ifneq ($(dvm_arch),mips)    # MIPS support for self-verification is incomplete
@@ -83,6 +86,9 @@
     # TODO: split out the asflags.
     LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
     LOCAL_MODULE := libdvm_sv
+    ifeq ($(TARGET_ARCH),x86)
+    LOCAL_LDFLAGS += -Wl,--no-fatal-warnings
+    endif
     include $(BUILD_SHARED_LIBRARY)
 
 endif # dvm_arch!=mips
@@ -95,6 +101,9 @@
 # TODO: split out the asflags.
 LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
 LOCAL_MODULE := libdvm_interp
+ifeq ($(TARGET_ARCH),x86)
+LOCAL_LDFLAGS += -Wl,--no-fatal-warnings
+endif
 include $(BUILD_SHARED_LIBRARY)