diff options
| author | Colin Cross <ccross@android.com> | 2016-05-04 23:57:39 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-04 23:57:39 +0000 |
| commit | 335a8a169ca8fd404064aaa4d8a5e4d30fe500bf (patch) | |
| tree | 71b9e9812b110db347a1d971623f333818068d98 | |
| parent | 0293a8a8f4e67784e70303e2813ec9b3d9fb274f (diff) | |
| parent | 529764ba68dd5573e636e21e812ca1e4774df6b6 (diff) | |
| download | gtest-335a8a169ca8fd404064aaa4d8a5e4d30fe500bf.tar.gz | |
Merge "Allow libgtest on unbundled builds" am: 55cc0e85b9
am: 529764ba68
* commit '529764ba68dd5573e636e21e812ca1e4774df6b6':
Allow libgtest on unbundled builds
Change-Id: I9c7138f7f0c7462ede07322710580ae9aa3eece3
| -rw-r--r-- | Android.bp | 20 |
1 files changed, 0 insertions, 20 deletions
@@ -36,16 +36,6 @@ 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 { @@ -193,16 +183,6 @@ cc_test { 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", |