diff options
| author | Miao Wang <miaowang@google.com> | 2015-07-14 13:41:14 -0700 |
|---|---|---|
| committer | Stephen Hines <srhines@google.com> | 2015-07-24 16:51:41 -0700 |
| commit | 9267631bae87a62f03338958c6f6c3dcb9af3884 (patch) | |
| tree | 23842eadc4e401f96ac58ecc08448b6073cd3421 | |
| parent | 68f030476cbad3be84cd3baacf9518865d5ff877 (diff) | |
| download | eigen-9267631bae87a62f03338958c6f6c3dcb9af3884.tar.gz | |
Make eigen about to build for API 8 (RenderScript support lib)
bug: 22700067
bug: 22693954
(cherry picked from commit 3d5aa45e219517b8fc597907f03f47795ab961ee)
Change-Id: I3ced2120e8401dd75f3d3a4aac20322ca9223c6f
| -rw-r--r-- | blas/Android.mk | 31 |
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) |