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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/test/BUILD.gn

Issue 758473002: Fix some android configuration (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 years 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
« no previous file with comments | « build/config/android/config.gni ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/BUILD.gn
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index 8bda28546e3f2be81bcc17e22951414ca08e41f4..d56b1a7b33b104093ed5779dbc4a95a700b071b9 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -5,11 +5,6 @@
import("//build/config/features.gni")
import("//build/config/ui.gni")
-gypi_values = exec_script("//build/gypi_to_gn.py",
- [ rebase_path("../chrome_tests.gypi") ],
- "scope",
- [ "../chrome_tests.gypi" ])
-
# This target exists to reference other test executables to bring these files
# into the build.
group("test") {
@@ -218,185 +213,192 @@ source_set("test_support_unit") {
]
}
-source_set("sync_integration_test_support") {
- testonly = true
-
- sources = rebase_path(gypi_values.test_support_sync_integration_sources,
- ".",
- "//chrome")
- deps = [
- ":test_support",
- "//base",
- "//chrome",
- "//chrome/browser",
- "//components/invalidation",
- "//components/invalidation:test_support",
- "//net",
- "//skia",
- "//sync",
- "//sync:test_support_sync_testserver",
- "//sync:test_support_sync_fake_server",
- "//ui/app_list:test_support",
- ]
-
- if (is_mac) {
- sources -= [
- "../browser/sync/test/integration/dictionary_helper.cc",
- "../browser/sync/test/integration/dictionary_helper.h",
- "../browser/sync/test/integration/dictionary_load_observer.cc",
- "../browser/sync/test/integration/dictionary_load_observer.h",
- ]
- }
- if (!enable_app_list) {
- sources -= [
- "../browser/sync/test/integration/sync_app_list_helper.cc",
- "../browser/sync/test/integration/sync_app_list_helper.h",
+if (!is_android) {
+ gypi_values = exec_script(
+ "//build/gypi_to_gn.py",
+ [ rebase_path("../chrome_tests.gypi") ],
+ "scope",
+ [ "../chrome_tests.gypi" ])
+
+ source_set("sync_integration_test_support") {
cjhopman 2014/12/08 03:12:10 Ugh, Rietveld diff for everything below this is ug
+ testonly = true
+ sources = rebase_path(gypi_values.test_support_sync_integration_sources,
+ ".",
+ "//chrome")
+ deps = [
+ ":test_support",
+ "//base",
+ "//chrome",
+ "//chrome/browser",
+ "//components/invalidation",
+ "//components/invalidation:test_support",
+ "//net",
+ "//skia",
+ "//sync",
+ "//sync:test_support_sync_testserver",
+ "//sync:test_support_sync_fake_server",
+ "//ui/app_list:test_support",
]
+
+ if (is_mac) {
+ sources -= [
+ "../browser/sync/test/integration/dictionary_helper.cc",
+ "../browser/sync/test/integration/dictionary_helper.h",
+ "../browser/sync/test/integration/dictionary_load_observer.cc",
+ "../browser/sync/test/integration/dictionary_load_observer.h",
+ ]
+ }
+ if (!enable_app_list) {
+ sources -= [
+ "../browser/sync/test/integration/sync_app_list_helper.cc",
+ "../browser/sync/test/integration/sync_app_list_helper.h",
+ ]
+ }
}
-}
-test("sync_integration_tests") {
- sources =
- rebase_path(gypi_values.sync_integration_tests_sources, ".", "//chrome")
+ test("sync_integration_tests") {
+ sources =
+ rebase_path(gypi_values.sync_integration_tests_sources, ".", "//chrome")
+
+ # TODO(phajdan.jr): Only temporary, to make transition easier.
+ defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
+
+ deps = [
+ ":sync_integration_test_support",
+ ":test_support",
+ "//base/allocator",
+ "//chrome:packed_extra_resources",
+ "//chrome:packed_resources",
+ "//chrome:resources",
+ "//chrome:strings",
+ "//chrome/common",
+ "//chrome/renderer",
+ "//crypto:platform",
+ "//sync",
+ "//testing/gmock",
+ "//testing/gtest",
+ "//third_party/icu",
+ "//third_party/leveldatabase",
+ "//third_party/npapi",
+ "//third_party/WebKit/public:blink",
+ ]
- # TODO(phajdan.jr): Only temporary, to make transition easier.
- defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
+ if (cld_version == 0 || cld_version == 2) {
+ # Language detection is irrelevant to sync, so it can depend on any
+ # implementation for CLD2. Dynamic is smaller, so go with dynamic.
+ deps += [ "//third_party/cld_2:cld2_dynamic" ]
+ }
+ if (is_mac) {
+ # Dictionary sync is disabled on Mac.
+ sources -= [
+ "../browser/sync/test/integration/multiple_client_dictionary_sync_test.cc",
+ "../browser/sync/test/integration/single_client_dictionary_sync_test.cc",
+ "../browser/sync/test/integration/two_client_dictionary_sync_test.cc",
+ ]
- deps = [
- ":sync_integration_test_support",
- ":test_support",
- "//base/allocator",
- "//chrome:packed_extra_resources",
- "//chrome:packed_resources",
- "//chrome:resources",
- "//chrome:strings",
- "//chrome/common",
- "//chrome/renderer",
- "//crypto:platform",
- "//sync",
- "//testing/gmock",
- "//testing/gtest",
- "//third_party/icu",
- "//third_party/leveldatabase",
- "//third_party/npapi",
- "//third_party/WebKit/public:blink",
- ]
+ # The sync_integration_tests do not run on mac without this flag.
+ # Search for comments about "xcode_settings" elsewhere in this file.
+ ldflags = [ "-Wl,-ObjC" ]
+ }
+ if (is_win) {
+ # TODO(GYP) figure out what these should map to.
+ #sources += [
+ # '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
+ # '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_unscaled_resources.rc',
+ #]
+ deps += [
+ "//third_party/wtl",
+ #'chrome_version_resources', TODO(GYP)
+ ]
+ } else {
+ sources -= [ "../app/chrome_version.rc.version" ]
+ }
- if (cld_version == 0 || cld_version == 2) {
- # Language detection is irrelevant to sync, so it can depend on any
- # implementation for CLD2. Dynamic is smaller, so go with dynamic.
- deps += [ "//third_party/cld_2:cld2_dynamic" ]
+ if (toolkit_views) {
+ deps += [ "//ui/views" ]
+ }
+ if (enable_basic_printing || enable_print_preview) {
+ deps += [ "//printing" ]
+ }
+ if (!enable_app_list) {
+ sources -= [
+ "../browser/sync/test/integration/single_client_app_list_sync_test.cc",
+ "../browser/sync/test/integration/two_client_app_list_sync_test.cc",
+ ]
+ }
+ if (!enable_supervised_users) {
+ sources -= [ "../browser/sync/test/integration/single_client_supervised_user_settings_sync_test.cc" ]
+ }
}
- if (is_mac) {
- # Dictionary sync is disabled on Mac.
- sources -= [
- "../browser/sync/test/integration/multiple_client_dictionary_sync_test.cc",
- "../browser/sync/test/integration/single_client_dictionary_sync_test.cc",
- "../browser/sync/test/integration/two_client_dictionary_sync_test.cc",
- ]
- # The sync_integration_tests do not run on mac without this flag.
- # Search for comments about "xcode_settings" elsewhere in this file.
- ldflags = [ "-Wl,-ObjC" ]
- }
- if (is_win) {
- # TODO(GYP) figure out what these should map to.
- #sources += [
- # '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
- # '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_unscaled_resources.rc',
- #]
- deps += [
- "//third_party/wtl",
- #'chrome_version_resources', TODO(GYP)
- ]
- } else {
- sources -= [ "../app/chrome_version.rc.version" ]
- }
+ test("sync_performance_tests") {
+ sources =
+ rebase_path(gypi_values.sync_performance_tests_sources, ".", "//chrome")
- if (toolkit_views) {
- deps += [ "//ui/views" ]
- }
- if (enable_basic_printing || enable_print_preview) {
- deps += [ "//printing" ]
- }
- if (!enable_app_list) {
- sources -= [
- "../browser/sync/test/integration/single_client_app_list_sync_test.cc",
- "../browser/sync/test/integration/two_client_app_list_sync_test.cc",
+ defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
+
+ deps = [
+ ":sync_integration_test_support",
+ "//base/allocator",
+ "//crypto:platform",
+ "//sync",
+ "//testing/gmock",
+ "//testing/gtest",
]
- }
- if (!enable_supervised_users) {
- sources -= [ "../browser/sync/test/integration/single_client_supervised_user_settings_sync_test.cc" ]
- }
-}
-test("sync_performance_tests") {
- sources =
- rebase_path(gypi_values.sync_performance_tests_sources, ".", "//chrome")
+ if (cld_version == 0 || cld_version == 2) {
+ # Language detection is irrelevant to sync, so it can depend on any
+ # implementation for CLD2. Dynamic is smaller, so go with dynamic.
+ deps += [ "//third_party/cld_2:cld2_dynamic" ]
+ }
- defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
+ if (is_mac) {
+ # Dictionary sync is disabled on Mac.
+ sources -= [ "../browser/sync/test/integration/performance/dictionary_sync_perf_test.cc" ]
- deps = [
- ":sync_integration_test_support",
- "//base/allocator",
- "//crypto:platform",
- "//sync",
- "//testing/gmock",
- "//testing/gtest",
- ]
+ # The sync_performance_tests do not run on mac without this flag.
+ # Search for comments about "xcode_settings" elsewhere in this file.
+ ldflags = [ "-Wl,-ObjC" ]
+ }
+ if (is_win) {
+ # TODO(GYP) figure out what these should map to.
+ #sources += [
+ # '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
+ # '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_unscaled_resources.rc',
+ #]
+ deps += [
+ "//third_party/wtl",
+ #'chrome_version_resources', TODO(GYP)
+ ]
+ } else {
+ sources -= [ "../app/chrome_version.rc.version" ]
+ }
- if (cld_version == 0 || cld_version == 2) {
- # Language detection is irrelevant to sync, so it can depend on any
- # implementation for CLD2. Dynamic is smaller, so go with dynamic.
- deps += [ "//third_party/cld_2:cld2_dynamic" ]
+ if (toolkit_views) {
+ deps += [ "//ui/views" ]
+ }
}
- if (is_mac) {
- # Dictionary sync is disabled on Mac.
- sources -= [ "../browser/sync/test/integration/performance/dictionary_sync_perf_test.cc" ]
+# Executable to measure time to load libraries.
+ test("load_library_perf_tests") {
+ sources = [
+ "../browser/load_library_perf_test.cc",
+ ]
- # The sync_performance_tests do not run on mac without this flag.
- # Search for comments about "xcode_settings" elsewhere in this file.
- ldflags = [ "-Wl,-ObjC" ]
- }
- if (is_win) {
- # TODO(GYP) figure out what these should map to.
- #sources += [
- # '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
- # '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_unscaled_resources.rc',
- #]
- deps += [
- "//third_party/wtl",
- #'chrome_version_resources', TODO(GYP)
+ deps = [
+ "//base/test:test_support_perf",
+ "//testing/gtest",
+ "//testing/perf",
+ "//third_party/widevine/cdm:version_h",
]
- } else {
- sources -= [ "../app/chrome_version.rc.version" ]
- }
- if (toolkit_views) {
- deps += [ "//ui/views" ]
+ # TODO(GYP) CDM adapter stuff.
+ #if (enable_pepper_cdms) {
+ # deps += [
+ # "//media/cdm/ppapi:clearkeycdmadapter",
+ # "//ppapi:ppapi_cpp",
+ # "//third_party/widevine/cdm:adapter",
+ # ]
+ #}
}
}
-
-# Executable to measure time to load libraries.
-test("load_library_perf_tests") {
- sources = [
- "../browser/load_library_perf_test.cc",
- ]
-
- deps = [
- "//base/test:test_support_perf",
- "//testing/gtest",
- "//testing/perf",
- "//third_party/widevine/cdm:version_h",
- ]
-
- # TODO(GYP) CDM adapter stuff.
- #if (enable_pepper_cdms) {
- # deps += [
- # "//media/cdm/ppapi:clearkeycdmadapter",
- # "//ppapi:ppapi_cpp",
- # "//third_party/widevine/cdm:adapter",
- # ]
- #}
-}
« no previous file with comments | « build/config/android/config.gni ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698