diff options
author | Colin Cross <ccross@android.com> | 2015-12-18 21:41:28 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2015-12-18 21:41:28 +0000 |
commit | 3d419cf1d9aa7eba588b800111550d4ac40f1d53 (patch) | |
tree | ce23919f75c2f8266b3d7c9da7a44cca7d7b3269 | |
parent | f2ddbecca4a5cf39e2d507dd60a3a27153795e47 (diff) | |
parent | 9cffd81dd9df243cce02c811c67a0bb341bb35ba (diff) | |
download | gtest-3d419cf1d9aa7eba588b800111550d4ac40f1d53.tar.gz |
Merge "Fix gtest soong unbundled builds" am: 0931ed239b
am: 9cffd81dd9
* commit '9cffd81dd9df243cce02c811c67a0bb341bb35ba':
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: [ |