commit 529764ba68dd5573e636e21e812ca1e4774df6b6
author Colin Cross <ccross@android.com> Wed May 04 23:55:19 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed May 04 23:55:19 2016 +0000
tree 38e59db4fb3bb0ef846588e072be61fef9330511
parent e3745d84419dd2604e5eb8c15daa208defc2393f
parent 55cc0e85b97b656885aaab8d5688ff9b32bc7e88

Merge "Allow libgtest on unbundled builds"
am: 55cc0e85b9

* commit '55cc0e85b97b656885aaab8d5688ff9b32bc7e88':
  Allow libgtest on unbundled builds

Change-Id: I76fd1a11e62ac31dd817681340f96ff0cfecc6b5

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",