diff options
author | Colin Cross <ccross@android.com> | 2015-12-18 21:24:48 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-12-18 21:24:48 +0000 |
commit | 0931ed239bd1bd38d79fcd85e176e27af8537cc8 (patch) | |
tree | 67b5eb1016925ec04c0514801ddd323f05ce60b0 | |
parent | b3a150864e66c8bfcb4ad5a6ebf0876c02b2b8fa (diff) | |
parent | f463507de3d66ce1e4566068a7d406e195189820 (diff) | |
download | gtest-0931ed239bd1bd38d79fcd85e176e27af8537cc8.tar.gz |
Merge "Fix gtest soong unbundled builds"
-rw-r--r-- | Android.bp | 26 |
1 files changed, 18 insertions, 8 deletions
@@ -36,6 +36,16 @@ cc_defaults { ], 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 @@ cc_defaults { windows: { enabled: true, }, - host: { - product_variables: { - unbundled_build: { - // Don't build for unbundled branches - enabled: false, - }, - }, - }, }, } @@ -147,6 +149,14 @@ cc_test { cflags: ["-O0"], ldflags: ["-lpthread"], }, + android: { + product_variables: { + unbundled_build: { + // Don't build for unbundled branches + enabled: false, + }, + }, + }, }, test_per_src: true, srcs: [ |