Merge "Only mips needs libffi (for unoptimized dalvik JNI)."
diff --git a/Android.mk b/Android.mk
index 686759f..e7c57dd 100644
--- a/Android.mk
+++ b/Android.mk
@@ -23,26 +23,23 @@
# Build rules for the target.
#
-# We only build ffi at all for non-arm, non-x86 targets.
-ifneq ($(TARGET_ARCH),arm)
- ifneq ($(TARGET_ARCH),x86)
+# We only build ffi for mips.
+ifeq ($(TARGET_ARCH),mips)
- include $(CLEAR_VARS)
+ include $(CLEAR_VARS)
- ffi_arch := $(TARGET_ARCH)
- ffi_os := $(TARGET_OS)
+ ffi_arch := $(TARGET_ARCH)
+ ffi_os := $(TARGET_OS)
- # This include just keeps the nesting a bit saner.
- include $(LOCAL_PATH)/Libffi.mk
+ # This include just keeps the nesting a bit saner.
+ include $(LOCAL_PATH)/Libffi.mk
- LOCAL_MODULE_TAGS := optional
- LOCAL_MODULE := libffi
+ LOCAL_MODULE_TAGS := optional
+ LOCAL_MODULE := libffi
- include $(BUILD_SHARED_LIBRARY)
+ include $(BUILD_SHARED_LIBRARY)
- endif
endif
# Also include the rules for the test suite.
include external/libffi/testsuite/Android.mk
-
diff --git a/testsuite/Android.mk b/testsuite/Android.mk
index d7f53de..d70360c 100644
--- a/testsuite/Android.mk
+++ b/testsuite/Android.mk
@@ -19,20 +19,18 @@
# Single test file to use when doing a default build.
FFI_SINGLE_TEST_FILE := libffi.call/struct5.c
-# We only build ffi at all for non-arm, non-x86 targets.
-ifneq ($(TARGET_ARCH),arm)
- ifneq ($(TARGET_ARCH),x86)
+# We only build ffi at all for mips.
+ifeq ($(TARGET_ARCH),mips)
- include $(CLEAR_VARS)
+ include $(CLEAR_VARS)
- LOCAL_SRC_FILES := $(FFI_SINGLE_TEST_FILE)
- LOCAL_C_INCLUDES := external/libffi/$(TARGET_OS)-$(TARGET_ARCH)
- LOCAL_SHARED_LIBRARIES := libffi
+ LOCAL_SRC_FILES := $(FFI_SINGLE_TEST_FILE)
+ LOCAL_C_INCLUDES := external/libffi/$(TARGET_OS)-$(TARGET_ARCH)
+ LOCAL_SHARED_LIBRARIES := libffi
- LOCAL_MODULE := ffi-test
- LOCAL_MODULE_TAGS := tests
+ LOCAL_MODULE := ffi-test
+ LOCAL_MODULE_TAGS := tests
- include $(BUILD_EXECUTABLE)
+ include $(BUILD_EXECUTABLE)
- endif
endif
