aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiao Wang <miaowang@google.com>2015-09-22 16:18:57 -0700
committerMiao Wang <miaowang@google.com>2015-09-22 16:18:57 -0700
commit963b3cb31bd43460e5879d9f70e2f0636183634e (patch)
treeb1e26281967937c0009db8ce29b7dd0d390992dd
parent2fee75639cb117178e8682a4fad685769b0f719e (diff)
downloadgemmlowp-963b3cb31bd43460e5879d9f70e2f0636183634e.tar.gz
Build gemmlowpV8 for support lib using NEON
Change-Id: I3344329f25183f82cf58675b8c7a53f7945b7e07
-rw-r--r--eight_bit_int_gemm/Android.mk10
1 files changed, 6 insertions, 4 deletions
diff --git a/eight_bit_int_gemm/Android.mk b/eight_bit_int_gemm/Android.mk
index cc0abdc..663202c 100644
--- a/eight_bit_int_gemm/Android.mk
+++ b/eight_bit_int_gemm/Android.mk
@@ -20,8 +20,6 @@ LOCAL_MODULE := libbnnmlowp
LOCAL_CPP_EXTENSION := .cc
LOCAL_SRC_FILES:= eight_bit_int_gemm.cc
-
-LOCAL_CFLAGS += -no-integrated-as -std=c++11
LOCAL_C_INCLUDES += external/gemmlowp/
include $(BUILD_STATIC_LIBRARY)
@@ -31,11 +29,15 @@ LOCAL_CLANG := true
LOCAL_MODULE := libbnnmlowpV8
LOCAL_SDK_VERSION := 8
-
LOCAL_CPP_EXTENSION := .cc
LOCAL_SRC_FILES:= eight_bit_int_gemm.cc
-LOCAL_CFLAGS += -no-integrated-as -std=c++11
+# Always build gemmlowpV8 for armv7 using NEON,
+# alternate non-SIMD route is built in libRSSupport.
+ifeq ($(ARCH_ARM_HAVE_ARMV7A),true)
+LOCAL_CFLAGS_arm := -mfpu=neon
+endif
+LOCAL_CFLAGS += -std=c++11
LOCAL_CFLAGS += -DGEMMLOWP_USE_STLPORT
LOCAL_C_INCLUDES += external/gemmlowp/
LOCAL_NDK_STL_VARIANT := stlport_static