Merge "Android.bp: Move from src&test to top level"
diff --git a/Android.bp b/Android.bp
index b757071..804b16c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,176 @@
-subdirs = [
- "src",
- "test",
-]
+// Copyright (C) 2009 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+//
+
+// Gtest builds 2 libraries: libgtest and libgtest_main. libgtest
+// contains most of the code (assertions...) and libgtest_main just
+// provide a common main to run the test (ie if you link against
+// libgtest_main you won't/should not provide a main() entry point.
+//
+// We build these 2 libraries for the target device and for the host if
+// it is running linux and using ASTL.
+//
+
+// TODO: The targets below have some redundancy. Check if we cannot
+// condense them using function(s) for the common code.
+
+cc_defaults {
+ name: "libgtest_defaults",
+ local_include_dirs: [
+ "include",
+ ],
+ export_include_dirs: [
+ "include",
+ ],
+ cflags: ["-Wno-missing-field-initializers"],
+ cppflags: ["-std=gnu++98"],
+}
+
+cc_defaults {
+ name: "libgtest_host_defaults",
+
+ target: {
+ windows: {
+ enabled: true,
+ },
+ host: {
+ product_variables: {
+ unbundled_build: {
+ // Don't build for unbundled branches
+ enabled: false,
+ },
+ },
+ },
+ },
+}
+
+//######################################################################
+// gtest lib for the NDK
+
+cc_library_static {
+ name: "libgtest_ndk",
+ defaults: ["libgtest_defaults"],
+
+ sdk_version: "9",
+ stl: "stlport_static",
+
+ srcs: ["src/gtest-all.cc"],
+}
+
+//######################################################################
+// gtest_main for the NDK
+
+cc_library_static {
+ name: "libgtest_main_ndk",
+ defaults: ["libgtest_defaults"],
+
+ sdk_version: "9",
+ stl: "stlport_static",
+
+ srcs: ["src/gtest_main.cc"],
+}
+
+
+
+//######################################################################
+// gtest lib
+
+cc_library_static {
+ name: "libgtest",
+ defaults: ["libgtest_defaults", "libgtest_host_defaults"],
+
+ host_supported: true,
+ clang: true,
+
+ srcs: ["src/gtest-all.cc"],
+
+ sanitize: ["never"],
+ rtti: true,
+}
+
+//######################################################################
+// gtest_main lib
+
+cc_library_static {
+ name: "libgtest_main",
+ defaults: ["libgtest_defaults", "libgtest_host_defaults"],
+
+ host_supported: true,
+ clang: true,
+
+ srcs: ["src/gtest_main.cc"],
+
+ sanitize: ["never"],
+}
+
+// Legacy libraries for makefiles that refer to libgtest_host
+
+cc_library_host_static {
+ name: "libgtest_host",
+ whole_static_libs: ["libgtest"],
+ defaults: ["libgtest_host_defaults"],
+}
+
+cc_library_host_static {
+ name: "libgtest_main_host",
+ whole_static_libs: ["libgtest_main"],
+ defaults: ["libgtest_host_defaults"],
+}
+
+
+// Test for gtest. Run using 'runtest'.
+// The linux build and tests are run under valgrind by 'runtest'.
+
+cc_test {
+ name: "gtest",
+ cflags: ["-Wno-empty-body"],
+ local_include_dirs: ["include"],
+ static_libs: [
+ "libgtest_main",
+ "libgtest"
+ ],
+ host_supported: true,
+ target: {
+ host: {
+ cflags: ["-O0"],
+ ldflags: ["-lpthread"],
+ },
+ },
+ test_per_src: true,
+ srcs: [
+ "test/gtest_all_test.cc",
+ "test/gtest-death-test_test.cc",
+ "test/gtest_environment_test.cc",
+ "test/gtest-listener_test.cc",
+ "test/gtest_main_unittest.cc",
+ "test/gtest_no_test_unittest.cc",
+ "test/gtest-param-test2_test.cc",
+ "test/gtest_premature_exit_test.cc",
+ "test/gtest_repeat_test.cc",
+ "test/gtest_sole_header_test.cc",
+ "test/gtest_stress_test.cc",
+ "test/gtest-unittest-api_test.cc",
+
+ // We don't have exceptions.
+ //"test/gtest-death-test_ex_test.cc",
+ //"test/gtest_throw_on_failure_ex_test.cc",
+ // We don't have tr1::tuple.
+ //"test/gtest-tuple_test.cc",
+ // These don't build.
+ //"test/gtest-param-test_test.cc",
+ //"test/gtest-printers_test.cc",
+ ],
+}
+
diff --git a/src/Android.bp b/src/Android.bp
deleted file mode 100644
index 1992ca5..0000000
--- a/src/Android.bp
+++ /dev/null
@@ -1,131 +0,0 @@
-// Copyright (C) 2009 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//
-
-// Gtest builds 2 libraries: libgtest and libgtest_main. libgtest
-// contains most of the code (assertions...) and libgtest_main just
-// provide a common main to run the test (ie if you link against
-// libgtest_main you won't/should not provide a main() entry point.
-//
-// We build these 2 libraries for the target device and for the host if
-// it is running linux and using ASTL.
-//
-
-// TODO: The targets below have some redundancy. Check if we cannot
-// condense them using function(s) for the common code.
-
-cc_defaults {
- name: "libgtest_defaults",
- local_include_dirs: [
- "..",
- "../include",
- ],
- export_include_dirs: [
- "../include",
- ],
- cflags: ["-Wno-missing-field-initializers"],
- cppflags: ["-std=gnu++98"],
-}
-
-cc_defaults {
- name: "libgtest_host_defaults",
-
- target: {
- windows: {
- enabled: true,
- },
- host: {
- product_variables: {
- unbundled_build: {
- // Don't build for unbundled branches
- enabled: false,
- },
- },
- },
- },
-}
-
-//######################################################################
-// gtest lib for the NDK
-
-cc_library_static {
- name: "libgtest_ndk",
- defaults: ["libgtest_defaults"],
-
- sdk_version: "9",
- stl: "stlport_static",
-
- srcs: ["gtest-all.cc"],
-}
-
-//######################################################################
-// gtest_main for the NDK
-
-cc_library_static {
- name: "libgtest_main_ndk",
- defaults: ["libgtest_defaults"],
-
- sdk_version: "9",
- stl: "stlport_static",
-
- srcs: ["gtest_main.cc"],
-}
-
-
-
-//######################################################################
-// gtest lib
-
-cc_library_static {
- name: "libgtest",
- defaults: ["libgtest_defaults", "libgtest_host_defaults"],
-
- host_supported: true,
- clang: true,
-
- srcs: ["gtest-all.cc"],
-
- sanitize: ["never"],
- rtti: true,
-}
-
-//######################################################################
-// gtest_main lib
-
-cc_library_static {
- name: "libgtest_main",
- defaults: ["libgtest_defaults", "libgtest_host_defaults"],
-
- host_supported: true,
- clang: true,
-
- srcs: ["gtest_main.cc"],
-
- sanitize: ["never"],
-}
-
-// Legacy libraries for makefiles that refer to libgtest_host
-
-cc_library_host_static {
- name: "libgtest_host",
- whole_static_libs: ["libgtest"],
- defaults: ["libgtest_host_defaults"],
-}
-
-cc_library_host_static {
- name: "libgtest_main_host",
- whole_static_libs: ["libgtest_main"],
- defaults: ["libgtest_host_defaults"],
-}
diff --git a/test/Android.bp b/test/Android.bp
deleted file mode 100644
index 00e8a54..0000000
--- a/test/Android.bp
+++ /dev/null
@@ -1,106 +0,0 @@
-//
-// Copyright (C) 2009 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-cc_defaults {
- name: "gtest-defaults",
- cflags: ["-Wno-empty-body"],
- local_include_dirs: [
- "../include",
- ".."
- ],
- host_supported: true,
-}
-
-cc_test {
- name: "gtest-unittest-api_test",
- defaults: ["gtest-defaults"],
- srcs: ["gtest-unittest-api_test.cc"],
-}
-
-cc_test {
- name: "gtest_stress_test",
- defaults: ["gtest-defaults"],
- srcs: ["gtest_stress_test.cc"],
-}
-
-cc_test {
- name: "gtest_sole_header_test",
- defaults: ["gtest-defaults"],
- srcs: ["gtest_sole_header_test.cc"],
-}
-
-cc_test {
- name: "gtest_repeat_test",
- defaults: ["gtest-defaults"],
- srcs: ["gtest_repeat_test.cc"],
-}
-
-cc_test {
- name: "gtest_premature_exit_test",
- defaults: ["gtest-defaults"],
- srcs: ["gtest_premature_exit_test.cc"],
-}
-
-cc_test {
- name: "gtest-param-test2_test",
- defaults: ["gtest-defaults"],
- srcs: ["gtest-param-test2_test.cc"],
-}
-
-cc_test {
- name: "gtest_no_test_unittest",
- defaults: ["gtest-defaults"],
- srcs: ["gtest_no_test_unittest.cc"],
-}
-
-cc_test {
- name: "gtest_main_unittest",
- defaults: ["gtest-defaults"],
- srcs: ["gtest_main_unittest.cc"],
-}
-
-cc_test {
- name: "gtest-listener_test",
- defaults: ["gtest-defaults"],
- srcs: ["gtest-listener_test.cc"],
-}
-
-cc_test {
- name: "gtest_environment_test",
- defaults: ["gtest-defaults"],
- srcs: ["gtest_environment_test.cc"],
-}
-
-cc_test {
- name: "gtest-death-test_test",
- defaults: ["gtest-defaults"],
- srcs: ["gtest-death-test_test.cc"],
-}
-
-cc_test {
- name: "gtest_all_test",
- defaults: ["gtest-defaults"],
- srcs: ["gtest_all_test.cc"],
-}
-
-// We don't have exceptions.
-// gtest-death-test_ex_test.cc
-// gtest_throw_on_failure_ex_test.cc
-// We don't have tr1::tuple.
-// gtest-tuple_test.cc
-// These don't build.
-// gtest-param-test_test.cc
-// gtest-printers_test.cc
