aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Willemsen <dwillemsen@google.com>2015-12-21 16:19:12 -0800
committerandroid-build-merger <android-build-merger@google.com>2015-12-21 16:19:12 -0800
commit08308df1efe5e0fd821db3cf73d45006d8253165 (patch)
treed2dc4871514390f2d7ba38400645b0b448988d82
parent3d419cf1d9aa7eba588b800111550d4ac40f1d53 (diff)
parentd370feffd6b9f0d8df8f222d9c22dd32cce5532b (diff)
downloadgtest-08308df1efe5e0fd821db3cf73d45006d8253165.tar.gz
Merge "Remove extra cc_test options" am: b34755199fstudio-2.0-rc1studio-2.0gradle_2.0.0
am: d370feffd6 * commit 'd370feffd6b9f0d8df8f222d9c22dd32cce5532b': Remove extra cc_test options
-rw-r--r--Android.bp8
1 files changed, 0 insertions, 8 deletions
diff --git a/Android.bp b/Android.bp
index c456b40..69eb615 100644
--- a/Android.bp
+++ b/Android.bp
@@ -139,16 +139,8 @@ cc_test {
name: "gtest",
cflags: ["-Wno-empty-body"],
local_include_dirs: ["include"],
- static_libs: [
- "libgtest_main",
- "libgtest"
- ],
host_supported: true,
target: {
- host: {
- cflags: ["-O0"],
- ldflags: ["-lpthread"],
- },
android: {
product_variables: {
unbundled_build: {