Merge "Mark libffi as optional for non-ARM/x86 builds"
diff --git a/Android.mk b/Android.mk
index 2352581..686759f 100644
--- a/Android.mk
+++ b/Android.mk
@@ -35,6 +35,7 @@
        # This include just keeps the nesting a bit saner.
        include $(LOCAL_PATH)/Libffi.mk
 
+       LOCAL_MODULE_TAGS := optional
        LOCAL_MODULE := libffi
 
        include $(BUILD_SHARED_LIBRARY)