commit 5c580cf0d868fdf9122a107e4d296fbf90e9085e
author gitbuildkicker <android-build@google.com> Thu Apr 20 00:34:25 2017 -0700
committer gitbuildkicker <android-build@google.com> Thu Apr 20 00:34:25 2017 -0700
tree 27654a3a42e8292d780fae503c55d43c9ed4ab28
parent 64c90baff234cabd1cd2597ec33dbdc6819fc048
parent 8e227ab2d053be431a6f15f2b2deeb3f72c5d9a7

merge in oc-dr1-release history after reset to master

googlemock/Android.bp

diff --git a/googlemock/Android.bp b/googlemock/Android.bp
index 0f2f9e5..337c054 100644
--- a/googlemock/Android.bp
+++ b/googlemock/Android.bp
@@ -61,6 +61,7 @@
     srcs: ["src/gmock-all.cc"],
     rtti: true,
     static_libs: ["libgtest"],
+    vendor_available: true,
 }
 
 cc_library_static {
@@ -68,6 +69,7 @@
     defaults: ["gmock_defaults", "gmock_flags"],
     srcs: ["src/gmock_main.cc"],
     static_libs: ["libgtest"],
+    vendor_available: true,
 }
 
 // Deprecated: use libgmock instead

googletest/Android.bp

diff --git a/googletest/Android.bp b/googletest/Android.bp
index 3c8470f..705c823 100644
--- a/googletest/Android.bp
+++ b/googletest/Android.bp
@@ -14,12 +14,7 @@
 
 cc_defaults {
     name: "libgtest_defaults",
-    local_include_dirs: [
-        "include",
-    ],
-    export_include_dirs: [
-        "include",
-    ],
+    export_include_dirs: ["include"],
 }
 
 cc_defaults {
@@ -94,6 +89,7 @@
     name: "libgtest",
     defaults: ["libgtest_defaults", "libgtest_host_defaults"],
     host_supported: true,
+    vendor_available: true,
     srcs: ["src/gtest-all.cc"],
     rtti: true,
 }
@@ -102,6 +98,7 @@
     name: "libgtest_main",
     defaults: ["libgtest_defaults", "libgtest_host_defaults"],
     host_supported: true,
+    vendor_available: true,
     clang: true,
     srcs: ["src/gtest_main.cc"],
 }
@@ -123,6 +120,7 @@
     name: "libgtest_prod",
     defaults: ["libgtest_defaults", "libgtest_host_defaults"],
     host_supported: true,
+    vendor_available: true,
     export_include_dirs: ["include"],
 }