Merge "Add -Wl,--no-fatal-warnings to x86 build"
diff --git a/vm/Android.mk b/vm/Android.mk
index e5d5448..91356d2 100644
--- a/vm/Android.mk
+++ b/vm/Android.mk
@@ -46,6 +46,9 @@
 # Overwrite default settings
 LOCAL_MODULE := libdvm
 LOCAL_CFLAGS += $(target_smp_flag)
+ifeq ($(TARGET_ARCH),x86)
+LOCAL_LDFLAGS += -Wl,--no-fatal-warnings
+endif
 
 # Define WITH_ADDRESS_SANITIZER to build an ASan-instrumented version of the
 # library in /system/lib/asan/libdvm.so.