commit 0931ed239bd1bd38d79fcd85e176e27af8537cc8
author Colin Cross <ccross@android.com> Fri Dec 18 21:24:48 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Dec 18 21:24:48 2015 +0000
tree 67b5eb1016925ec04c0514801ddd323f05ce60b0
parent b3a150864e66c8bfcb4ad5a6ebf0876c02b2b8fa
parent f463507de3d66ce1e4566068a7d406e195189820

Merge "Fix gtest soong unbundled builds"

Android.bp

diff --git a/Android.bp b/Android.bp
index 804b16c..c456b40 100644
--- a/Android.bp
+++ b/Android.bp
@@ -36,6 +36,16 @@
     ],
     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 {
@@ -45,14 +55,6 @@
         windows: {
             enabled: true,
         },
-        host: {
-            product_variables: {
-                unbundled_build: {
-                    // Don't build for unbundled branches
-                    enabled: false,
-                },
-            },
-        },
     },
 }
 
@@ -147,6 +149,14 @@
             cflags: ["-O0"],
             ldflags: ["-lpthread"],
         },
+        android: {
+            product_variables: {
+                unbundled_build: {
+                    // Don't build for unbundled branches
+                    enabled: false,
+                },
+            },
+        },
     },
     test_per_src: true,
     srcs: [