aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiao Wang <miaowang@google.com>2015-07-14 13:41:14 -0700
committerMiao Wang <miaowang@google.com>2015-07-14 16:35:05 -0700
commit3d5aa45e219517b8fc597907f03f47795ab961ee (patch)
treef05ecf14f827fe8f52353166f8b061512b8881c1
parent8dcf06aca25b2fe4f2b88775843dbfadaaca8568 (diff)
downloadeigen-3d5aa45e219517b8fc597907f03f47795ab961ee.tar.gz
Make eigen about to build for API 8 (RenderScript support lib)
Change-Id: I133dd24965051045bc24358e6fb91ac44b926ff5
-rw-r--r--blas/Android.mk31
1 files changed, 24 insertions, 7 deletions
diff --git a/blas/Android.mk b/blas/Android.mk
index 54b9708f1..1d4300bae 100644
--- a/blas/Android.mk
+++ b/blas/Android.mk
@@ -15,13 +15,7 @@
LOCAL_PATH:=$(call my-dir)
include $(CLEAR_VARS)
-LOCAL_CLANG := true
-# EIGEN_ANDROID_SSE_WR is for "Eigen Android SSE Work Around"
-# Will be removed after we understand it better.
-LOCAL_CFLAGS += -DEIGEN_ANDROID_SSE_WR
-LOCAL_MODULE := libF77blas
-
-LOCAL_SRC_FILES:= \
+eigen_SRC_FILES:= \
single.cpp \
double.cpp \
complex_single.cpp \
@@ -48,6 +42,29 @@ LOCAL_SRC_FILES:= \
f2c/d_cnjg.c \
f2c/r_cnjg.c
+LOCAL_CLANG := true
+# EIGEN_ANDROID_SSE_WR is for "Eigen Android SSE Work Around"
+# Will be removed after we understand it better.
+LOCAL_CFLAGS += -DEIGEN_ANDROID_SSE_WR
+LOCAL_MODULE := libF77blas
+
+LOCAL_SRC_FILES := $(eigen_SRC_FILES)
+LOCAL_C_INCLUDES += external/eigen/
+
+include $(BUILD_STATIC_LIBRARY)
+
+
+# Build Eigen using API 8 toolchain for RS Support lib.
+include $(CLEAR_VARS)
+LOCAL_CLANG := true
+# EIGEN_ANDROID_SSE_WR is for "Eigen Android SSE Work Around"
+# Will be removed after we understand it better.
+LOCAL_CFLAGS += -DEIGEN_ANDROID_SSE_WR
+LOCAL_MODULE := libF77blasV8
+LOCAL_SDK_VERSION := 8
+LOCAL_NDK_STL_VARIANT := stlport_static
+
+LOCAL_SRC_FILES := $(eigen_SRC_FILES)
LOCAL_C_INCLUDES += external/eigen/
include $(BUILD_STATIC_LIBRARY)