diff options
| author | Miao Wang <miaowang@google.com> | 2015-07-15 01:29:28 -0700 |
|---|---|---|
| committer | Stephen Hines <srhines@google.com> | 2015-07-24 16:52:01 -0700 |
| commit | 1ba7f856248f3d72a4549722b6c80dd6fde4abf5 (patch) | |
| tree | 0659c84392cc5768c12e1962d76e58d97940a2b0 | |
| parent | 9267631bae87a62f03338958c6f6c3dcb9af3884 (diff) | |
| download | eigen-android-cts-6.0_r32.tar.gz | |
Make eigen and libblas able to build for API8 x86 target.android-m-preview-2android-lego-6.0.1_r2android-lego-6.0.1_r1android-cts-6.0_r9android-cts-6.0_r8android-cts-6.0_r7android-cts-6.0_r6android-cts-6.0_r5android-cts-6.0_r4android-cts-6.0_r32android-cts-6.0_r31android-cts-6.0_r30android-cts-6.0_r3android-cts-6.0_r29android-cts-6.0_r28android-cts-6.0_r27android-cts-6.0_r26android-cts-6.0_r25android-cts-6.0_r24android-cts-6.0_r23android-cts-6.0_r22android-cts-6.0_r21android-cts-6.0_r20android-cts-6.0_r2android-cts-6.0_r19android-cts-6.0_r18android-cts-6.0_r17android-cts-6.0_r16android-cts-6.0_r15android-cts-6.0_r14android-cts-6.0_r13android-cts-6.0_r12android-cts-6.0_r1android-6.0.1_r9android-6.0.1_r81android-6.0.1_r80android-6.0.1_r8android-6.0.1_r79android-6.0.1_r78android-6.0.1_r77android-6.0.1_r74android-6.0.1_r73android-6.0.1_r72android-6.0.1_r70android-6.0.1_r7android-6.0.1_r69android-6.0.1_r68android-6.0.1_r67android-6.0.1_r66android-6.0.1_r65android-6.0.1_r63android-6.0.1_r62android-6.0.1_r61android-6.0.1_r60android-6.0.1_r59android-6.0.1_r58android-6.0.1_r57android-6.0.1_r56android-6.0.1_r55android-6.0.1_r54android-6.0.1_r53android-6.0.1_r52android-6.0.1_r51android-6.0.1_r50android-6.0.1_r5android-6.0.1_r49android-6.0.1_r48android-6.0.1_r47android-6.0.1_r46android-6.0.1_r45android-6.0.1_r43android-6.0.1_r42android-6.0.1_r41android-6.0.1_r40android-6.0.1_r4android-6.0.1_r33android-6.0.1_r32android-6.0.1_r31android-6.0.1_r30android-6.0.1_r3android-6.0.1_r28android-6.0.1_r27android-6.0.1_r26android-6.0.1_r25android-6.0.1_r24android-6.0.1_r22android-6.0.1_r21android-6.0.1_r20android-6.0.1_r18android-6.0.1_r17android-6.0.1_r16android-6.0.1_r13android-6.0.1_r12android-6.0.1_r11android-6.0.1_r10android-6.0.1_r1android-6.0.0_r7android-6.0.0_r6android-6.0.0_r5android-6.0.0_r41android-6.0.0_r4android-6.0.0_r3android-6.0.0_r26android-6.0.0_r25android-6.0.0_r24android-6.0.0_r23android-6.0.0_r2android-6.0.0_r13android-6.0.0_r12android-6.0.0_r11android-6.0.0_r1marshmallow-releasemarshmallow-mr3-releasemarshmallow-mr2-releasemarshmallow-mr1-releasemarshmallow-mr1-devmarshmallow-dr1.6-releasemarshmallow-dr1.5-releasemarshmallow-dr1.5-devmarshmallow-dr-releasemarshmallow-dr-lego-releasemarshmallow-dr-dragon-releasemarshmallow-dr-devmarshmallow-devmarshmallow-cts-releasem-preview
- WAR for missing posix_memalign on API 8
bug: 22700067
bug: 22693954
(cherry picked from commit 8a387c93d83d5375edf414497775e6145b447f40)
Change-Id: Ic2b12d12e73821b825a7c17065de0a18cdfd64db
| -rw-r--r-- | Eigen/src/Core/util/Memory.h | 2 | ||||
| -rw-r--r-- | blas/Android.mk | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/Eigen/src/Core/util/Memory.h b/Eigen/src/Core/util/Memory.h index 330bcf518..624b17bbd 100644 --- a/Eigen/src/Core/util/Memory.h +++ b/Eigen/src/Core/util/Memory.h @@ -72,7 +72,7 @@ #define EIGEN_HAS_POSIX_MEMALIGN 0 #endif -#ifdef EIGEN_VECTORIZE_SSE +#if defined(EIGEN_VECTORIZE_SSE) && !defined(EIGEN_ANDROID_POSIX_MEMALIGN_WR) #define EIGEN_HAS_MM_MALLOC 1 #else #define EIGEN_HAS_MM_MALLOC 0 diff --git a/blas/Android.mk b/blas/Android.mk index 1d4300bae..edddaea1b 100644 --- a/blas/Android.mk +++ b/blas/Android.mk @@ -60,6 +60,9 @@ 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 +# EIGEN_ANDROID_POSIX_MEMALIGN_WR is for "Eigen Android posix_memalign Work Around" +# Only used for build for low Android API(x86 target) without posix_memalign. +LOCAL_CFLAGS += -DEIGEN_ANDROID_POSIX_MEMALIGN_WR LOCAL_MODULE := libF77blasV8 LOCAL_SDK_VERSION := 8 LOCAL_NDK_STL_VARIANT := stlport_static |