Make cblas able to build libblas.so for API 8 (RS Support lib)android-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-dragon-releasemarshmallow-dr-devmarshmallow-devmarshmallow-cts-release

bug: 22700067
bug: 22693954

Change-Id: I818833ab306c57a11071ff89e732a29a1a4d94e8
(cherry picked from commit d639809760bd920be6b14fef6b22eb743eb73b40)

1 files changed, 23 insertions, 4 deletions

diff --git a/Android.mk b/Android.mk
index 07d61d3..8f82add 100644
--- a/Android.mk
+++ b/Android.mk
@@ -15,10 +15,7 @@
 LOCAL_PATH:=$(call my-dir)
 
 include $(CLEAR_VARS)
-LOCAL_CLANG := true
-LOCAL_MODULE := libblas
-
-LOCAL_SRC_FILES:= \
+cblas_SRC_FILES:= \
 	src/cblas_caxpy.c \
 	src/cblas_ccopy.c \
 	src/cblas_cdotc_sub.c \
@@ -166,8 +163,30 @@ LOCAL_SRC_FILES:= \
 	src/xerbla.c
 
 
+LOCAL_CLANG := true
+LOCAL_MODULE := libblas
+LOCAL_SRC_FILES := $(cblas_SRC_FILES)
+
 LOCAL_C_INCLUDES += external/cblas/include
 
 LOCAL_STATIC_LIBRARIES := libF77blas
 
 include $(BUILD_SHARED_LIBRARY)
+
+
+# Build libblas using API 8 toolchain for RS Support lib.
+include $(CLEAR_VARS)
+
+LOCAL_CLANG := true
+LOCAL_MODULE := libblasV8
+LOCAL_SDK_VERSION := 8
+LOCAL_NDK_STL_VARIANT := stlport_static
+
+LOCAL_SRC_FILES := $(cblas_SRC_FILES)
+
+LOCAL_C_INCLUDES += external/cblas/include
+
+LOCAL_STATIC_LIBRARIES := libF77blasV8
+
+include $(BUILD_SHARED_LIBRARY)
+