commit 55cc0e85b97b656885aaab8d5688ff9b32bc7e88
author Treehugger Robot <treehugger-gerrit@google.com> Wed May 04 23:51:27 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed May 04 23:51:27 2016 +0000
tree 38e59db4fb3bb0ef846588e072be61fef9330511
parent a2a1af6d88e870e104a7d899a158ec241f07e71c
parent 4c0e47a9c87ef124483c0e90c27d545a73fe8afe

Merge "Allow libgtest on unbundled builds"

Android.bp

diff --git a/Android.bp b/Android.bp
index 1d95598..65a7676 100644
--- a/Android.bp
+++ b/Android.bp
@@ -36,16 +36,6 @@
     ],
     cflags: ["-Wno-missing-field-initializers"],
     cppflags: ["-std=gnu++98"],
-    target: {
-        android: {
-            product_variables: {
-                unbundled_build: {
-                    // Don't build for unbundled branches
-                    enabled: false,
-                },
-            },
-        },
-    },
 }
 
 cc_defaults {
@@ -193,16 +183,6 @@
     cflags: ["-Wno-empty-body"],
     local_include_dirs: ["include"],
     host_supported: true,
-    target: {
-        android: {
-            product_variables: {
-                unbundled_build: {
-                    // Don't build for unbundled branches
-                    enabled: false,
-                },
-            },
-        },
-    },
     test_per_src: true,
     srcs: [
         "test/gtest_all_test.cc",