commit 6ab460936e7ffb913a72016403c97bfaf0e9df90
author Colin Cross <ccross@android.com> Mon Mar 28 22:51:39 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Mar 28 22:51:39 2016 +0000
tree 80b3671ac0792b671db03abb0500aeb6a5d02480
parent 946b287abdafbe9ae8105ca31a4d8a5b0d9cec7f
parent 940944655a4c5ab06cc6f7c9657b0c43ff83ba5e

Merge "Update Android.bp to match Android.mk"

Android.bp

diff --git a/Android.bp b/Android.bp
index 69eb615..c892f22 100644
--- a/Android.bp
+++ b/Android.bp
@@ -84,7 +84,56 @@
     srcs: ["src/gtest_main.cc"],
 }
 
+//#######################################################################
+// gtest lib for the NDK, with libc++
 
+cc_library_static {
+    name: "libgtest_ndk_libcxx",
+    defaults: ["libgtest_defaults"],
+
+    sdk_version: "9",
+    stl: "c++_static",
+
+    srcs: ["src/gtest-all.cc"],
+}
+
+//#######################################################################
+// gtest_main for the NDK, with libc++
+
+cc_library_static {
+    name: "libgtest_main_ndk_libcxx",
+    defaults: ["libgtest_defaults"],
+
+    sdk_version: "9",
+    stl: "c++_static",
+
+    srcs: ["src/gtest_main.cc"],
+}
+
+//#######################################################################
+// gtest lib for the NDK, with gnustl
+
+cc_library_static {
+    name: "libgtest_ndk_gnustl",
+    defaults: ["libgtest_defaults"],
+
+    sdk_version: "9",
+    stl: "gnustl_static",
+
+    srcs: ["src/gtest-all.cc"],
+}
+
+//#######################################################################
+// gtest_main for the NDK, with gnustl
+cc_library_static {
+    name: "libgtest_main_ndk_gnustl",
+    defaults: ["libgtest_defaults"],
+
+    sdk_version: "9",
+    stl: "gnustl_static",
+
+    srcs: ["src/gtest_main.cc"],
+}
 
 //######################################################################
 // gtest lib