Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(420)

Unified Diff: ipc/BUILD.gn

Issue 227673008: Checkpoint work to get GN builds working on Android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: clean up Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ipc/BUILD.gn
diff --git a/ipc/BUILD.gn b/ipc/BUILD.gn
index fbff8190d3b61749eaee02ef77435637dd70c658..b425578b652059f931794a2fe5f30d610ae08c0a 100644
--- a/ipc/BUILD.gn
+++ b/ipc/BUILD.gn
@@ -79,81 +79,84 @@ component("ipc") {
]
}
-test("ipc_tests") {
- sources = [
- "file_descriptor_set_posix_unittest.cc",
- "ipc_channel_posix_unittest.cc",
- "ipc_channel_unittest.cc",
- "ipc_fuzzing_tests.cc",
- "ipc_message_unittest.cc",
- "ipc_message_utils_unittest.cc",
- "ipc_send_fds_test.cc",
- "ipc_sync_channel_unittest.cc",
- "ipc_sync_message_unittest.cc",
- "ipc_sync_message_unittest.h",
- "ipc_test_base.cc",
- "ipc_test_base.h",
- "sync_socket_unittest.cc",
- "unix_domain_socket_util_unittest.cc",
- ]
+# TODO(dpranke): crbug.com/360936. Get this to build and run on Android.
+if (!is_android) {
Dirk Pranke 2014/04/08 00:39:22 What's the best way to indicate "do not build this
brettw 2014/04/09 05:37:08 The way you did it
Dirk Pranke 2014/04/09 18:49:20 It seems like the if (!is_android) approach handle
brettw 2014/04/09 20:33:19 GN always generates build rules for all targets in
+ test("ipc_tests") {
+ sources = [
+ "file_descriptor_set_posix_unittest.cc",
+ "ipc_channel_posix_unittest.cc",
+ "ipc_channel_unittest.cc",
+ "ipc_fuzzing_tests.cc",
+ "ipc_message_unittest.cc",
+ "ipc_message_utils_unittest.cc",
+ "ipc_send_fds_test.cc",
+ "ipc_sync_channel_unittest.cc",
+ "ipc_sync_message_unittest.cc",
+ "ipc_sync_message_unittest.h",
+ "ipc_test_base.cc",
+ "ipc_test_base.h",
+ "sync_socket_unittest.cc",
+ "unix_domain_socket_util_unittest.cc",
+ ]
- if (is_win || is_ios) {
- sources -= [ "unix_domain_socket_util_unittest.cc" ]
+ if (is_win || is_ios) {
+ sources -= [ "unix_domain_socket_util_unittest.cc" ]
+ }
+
+ # TODO(brettw) hook up Android testing.
+ #if (is_android && gtest_target_type == "shared_library") {
+ # deps += "/testing/android/native_test.gyp:native_testNative_code"
+ #}
+
+ # TODO(brettw) hook up tcmalloc to this target.
+ #if (is_posix && !is_mac && !is_android) {
+ # # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
+ # if ((use_allocator!="none" && use_allocator!="see_use_tcmalloc") || (use_allocator=="see_use_tcmalloc" && linux_use_tcmalloc)) {
+ # deps += "/base/allocator"
+ # }
+ #}
+
+ deps = [
+ ":ipc",
+ ":test_support_ipc",
+ "//base",
+ "//base:base_i18n",
+ "//base/test:run_all_unittests",
+ "//base/test:test_support_base",
+ "//testing/gtest",
+ ]
}
- # TODO(brettw) hook up Android testing.
- #if (is_android && gtest_target_type == "shared_library") {
- # deps += "/testing/android/native_test.gyp:native_testNative_code"
- #}
-
- # TODO(brettw) hook up tcmalloc to this target.
- #if (is_posix && !is_mac && !is_android) {
- # # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
- # if ((use_allocator!="none" && use_allocator!="see_use_tcmalloc") || (use_allocator=="see_use_tcmalloc" && linux_use_tcmalloc)) {
- # deps += "/base/allocator"
- # }
- #}
-
- deps = [
- ":ipc",
- ":test_support_ipc",
- "//base",
- "//base:base_i18n",
- "//base/test:run_all_unittests",
- "//base/test:test_support_base",
- "//testing/gtest",
- ]
-}
-
-test("ipc_perftests") {
- sources = [
- "ipc_perftests.cc",
- "ipc_test_base.cc",
- "ipc_test_base.h",
- ]
-
- # TODO(brettw) hook up Android testing.
- #if (is_android && gtest_target_type == "shared_library") {
- # deps += "/testing/android/native_test.gyp:native_testNative_code"
- #}
-
- # TODO(brettw) hook up tcmalloc to this target.
- #if (is_posix && !is_mac && !is_android) {
- # # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
- # if ((use_allocator!="none" && use_allocator!="see_use_tcmalloc") || (use_allocator=="see_use_tcmalloc" && linux_use_tcmalloc)) {
- # deps += "//base/allocator"
- # }
- #}
+ test("ipc_perftests") {
+ sources = [
+ "ipc_perftests.cc",
+ "ipc_test_base.cc",
+ "ipc_test_base.h",
+ ]
- deps = [
- ":ipc",
- ":test_support_ipc",
- "//base",
- "//base:base_i18n",
- "//base/test:test_support_base",
- "//base/test:test_support_perf",
- "//testing/gtest",
- ]
+ # TODO(brettw) hook up Android testing.
+ #if (is_android && gtest_target_type == "shared_library") {
+ # deps += "/testing/android/native_test.gyp:native_testNative_code"
+ #}
+
+ # TODO(brettw) hook up tcmalloc to this target.
+ #if (is_posix && !is_mac && !is_android) {
+ # # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
+ # if ((use_allocator!="none" && use_allocator!="see_use_tcmalloc") || (use_allocator=="see_use_tcmalloc" && linux_use_tcmalloc)) {
+ # deps += "//base/allocator"
+ # }
+ #}
+
+ deps = [
+ ":ipc",
+ ":test_support_ipc",
+ "//base",
+ "//base:base_i18n",
brettw 2014/04/09 05:37:08 I renamed base_i18n "i18n" and test_support_base "
Dirk Pranke 2014/04/09 18:49:20 Ok, will fix.
+ "//base/test:test_support_base",
+ "//base/test:test_support_perf",
+ "//testing/gtest",
+ ]
+ }
}
static_library("test_support_ipc") {

Powered by Google App Engine
This is Rietveld 408576698