aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2016-05-04 15:39:22 -0700
committerColin Cross <ccross@android.com>2016-05-04 15:39:22 -0700
commit4c0e47a9c87ef124483c0e90c27d545a73fe8afe (patch)
tree38e59db4fb3bb0ef846588e072be61fef9330511
parent2a1db292c2ebaf7106951dd8e0dc1abeb2c8913b (diff)
downloadgtest-4c0e47a9c87ef124483c0e90c27d545a73fe8afe.tar.gz
Allow libgtest on unbundled builds
It's unclear why libgtest was ever disabled for unbundled builds, and soong gets confused seeing a module that exists and is needed by a module but is marked disabled. Change-Id: I264f2377f9f2c42e0e778761b4392da286fa3ec4
-rw-r--r--Android.bp20
1 files changed, 0 insertions, 20 deletions
diff --git a/Android.bp b/Android.bp
index 1d95598..65a7676 100644
--- a/Android.bp
+++ b/Android.bp
@@ -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",