diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2017-04-12 22:17:09 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-04-12 22:17:09 +0000 |
| commit | 2ad12394da637ecf210b30f694bbf5a12719ff0f (patch) | |
| tree | 27654a3a42e8292d780fae503c55d43c9ed4ab28 | |
| parent | eac02f91b43006b8b9a38fb98d4bc417b1933c98 (diff) | |
| parent | 3beed5b5f34a8118f418b206f893ef41c33f24b7 (diff) | |
| download | googletest-2ad12394da637ecf210b30f694bbf5a12719ff0f.tar.gz | |
Mark as vendor_available am: bff63a6026 am: c2041e1a32
am: 3beed5b5f3
Change-Id: Iff20b7bbacf2e11d2331a0632c576a7820aa534a
| -rw-r--r-- | googlemock/Android.bp | 2 | ||||
| -rw-r--r-- | googletest/Android.bp | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/googlemock/Android.bp b/googlemock/Android.bp index 0f2f9e5f..337c0540 100644 --- a/googlemock/Android.bp +++ b/googlemock/Android.bp @@ -61,6 +61,7 @@ cc_library_static { srcs: ["src/gmock-all.cc"], rtti: true, static_libs: ["libgtest"], + vendor_available: true, } cc_library_static { @@ -68,6 +69,7 @@ cc_library_static { defaults: ["gmock_defaults", "gmock_flags"], srcs: ["src/gmock_main.cc"], static_libs: ["libgtest"], + vendor_available: true, } // Deprecated: use libgmock instead diff --git a/googletest/Android.bp b/googletest/Android.bp index 3c8470fe..705c8235 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 @@ cc_library_static { 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 @@ cc_library_static { 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 @@ cc_library { name: "libgtest_prod", defaults: ["libgtest_defaults", "libgtest_host_defaults"], host_supported: true, + vendor_available: true, export_include_dirs: ["include"], } |