Merge "Convert external/eigen to Android.bp"
diff --git a/Android.bp b/Android.bp
index 5a00fb4..2c7c317 100644
--- a/Android.bp
+++ b/Android.bp
@@ -17,3 +17,4 @@
name: "libeigen",
}
+subdirs = ["blas"]
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index 1eef5c3..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright (C) 2012 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-LOCAL_PATH:=$(call my-dir)
-include $(LOCAL_PATH)/blas/Android.mk
diff --git a/blas/Android.bp b/blas/Android.bp
new file mode 100644
index 0000000..db0e4da
--- /dev/null
+++ b/blas/Android.bp
@@ -0,0 +1,59 @@
+// Copyright (C) 2015 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+cc_defaults {
+ name: "eigen-defaults",
+ srcs: [
+ "single.cpp",
+ "double.cpp",
+ "complex_single.cpp",
+ "complex_double.cpp",
+ "xerbla.cpp",
+ "f2c/complexdots.c",
+ "f2c/srotm.c",
+ "f2c/srotmg.c",
+ "f2c/drotm.c",
+ "f2c/drotmg.c",
+ "f2c/lsame.c",
+ "f2c/dspmv.c",
+ "f2c/ssbmv.c",
+ "f2c/chbmv.c",
+ "f2c/sspmv.c",
+ "f2c/zhbmv.c",
+ "f2c/chpmv.c",
+ "f2c/dsbmv.c",
+ "f2c/zhpmv.c",
+ "f2c/dtbmv.c",
+ "f2c/stbmv.c",
+ "f2c/ctbmv.c",
+ "f2c/ztbmv.c",
+ "f2c/d_cnjg.c",
+ "f2c/r_cnjg.c",
+ ],
+ cflags: ["-Wno-unused-parameter"],
+ export_include_dirs: ["."],
+}
+
+cc_library_static {
+ name: "libF77blas",
+ defaults: ["eigen-defaults"],
+}
+
+// Build Eigen using API 9 toolchain for RS Support lib.
+cc_library_static {
+ name: "libF77blasV8",
+ defaults: ["eigen-defaults"],
+ sdk_version: "9",
+ stl: "c++_static",
+}
diff --git a/blas/Android.mk b/blas/Android.mk
deleted file mode 100644
index 563b7c8..0000000
--- a/blas/Android.mk
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright (C) 2015 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-LOCAL_PATH:=$(call my-dir)
-
-include $(CLEAR_VARS)
-eigen_SRC_FILES:= \
- single.cpp \
- double.cpp \
- complex_single.cpp \
- complex_double.cpp \
- xerbla.cpp \
- f2c/complexdots.c\
- f2c/srotm.c \
- f2c/srotmg.c \
- f2c/drotm.c \
- f2c/drotmg.c \
- f2c/lsame.c \
- f2c/dspmv.c \
- f2c/ssbmv.c \
- f2c/chbmv.c \
- f2c/sspmv.c \
- f2c/zhbmv.c \
- f2c/chpmv.c \
- f2c/dsbmv.c \
- f2c/zhpmv.c \
- f2c/dtbmv.c \
- f2c/stbmv.c \
- f2c/ctbmv.c \
- f2c/ztbmv.c \
- f2c/d_cnjg.c \
- f2c/r_cnjg.c
-
-LOCAL_CLANG := true
-LOCAL_CFLAGS += -Wno-unused-parameter
-LOCAL_MODULE := libF77blas
-
-LOCAL_SRC_FILES := $(eigen_SRC_FILES)
-LOCAL_C_INCLUDES += external/eigen/
-
-include $(BUILD_STATIC_LIBRARY)
-
-
-# Build Eigen using API 9 toolchain for RS Support lib.
-include $(CLEAR_VARS)
-LOCAL_CLANG := true
-LOCAL_MODULE := libF77blasV8
-LOCAL_SDK_VERSION := 9
-LOCAL_NDK_STL_VARIANT := c++_static
-
-LOCAL_SRC_FILES := $(eigen_SRC_FILES)
-LOCAL_C_INCLUDES += external/eigen/
-
-include $(BUILD_STATIC_LIBRARY)
