Make cblas able to build libblas.so for API 8 (RS Support lib)
bug: 22700067
bug: 22693954
Change-Id: I818833ab306c57a11071ff89e732a29a1a4d94e8
(cherry picked from commit d639809760bd920be6b14fef6b22eb743eb73b40)
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 @@
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)
+