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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/test/BUILD.gn

Issue 2106193002: [Android] Create buildable browser_tests gn target for android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: sky comments Created 4 years, 5 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
« no previous file with comments | « chrome/chrome_tests.gypi ('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 b62091b070f9590cd9fe5a3ed5e96239e2958114..318e092c9f6c670a77f04537d517abd07318a009 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -859,111 +859,91 @@ if (!is_android) {
":browser_tests",
]
}
+}
- test("browser_tests") {
- sources = [
- "base/browser_tests_main.cc",
- ]
- sources +=
- rebase_path(chrome_tests_gypi_values.chrome_browser_tests_sources,
- ".",
- "//chrome")
- sources += rebase_path(
- chrome_tests_gypi_values.chrome_browser_extensions_test_support_sources,
- ".",
- "//chrome")
+test("browser_tests") {
+ sources = [
+ "base/browser_tests_main.cc",
+ ]
+ sources += rebase_path(chrome_tests_gypi_values.chrome_browser_tests_sources,
+ ".",
+ "//chrome")
- configs += [
- "//build/config:precompiled_headers",
- "//third_party/WebKit/public:debug_devtools",
- ]
+ configs += [
+ "//build/config:precompiled_headers",
+ "//third_party/WebKit/public:debug_devtools",
+ ]
- data = [
- "data/",
- "//chrome/browser/policy/test/asn1der.py",
- "//chrome/browser/policy/test/policy_testserver.py",
- "//chrome/common/extensions/docs/examples/apps/calculator/",
- "//chrome/third_party/mock4js/",
- "//content/test/data/",
- "//google_apis/test/",
- "//media/test/data/",
- "//net/tools/testserver/",
- "//ppapi/tests/test_case.html",
- "//ppapi/tests/test_case.html.mock-http-headers",
- "//ppapi/tests/test_page.css",
- "//ppapi/tests/test_page.css.mock-http-headers",
- "//testing/test_env.py",
- "//third_party/accessibility-audit/axs_testing.js",
- "//third_party/chaijs/chai.js",
- "//third_party/mocha/mocha.js",
- "//third_party/pyftpdlib/",
- "//third_party/pywebsocket/",
- "//third_party/simplejson/",
- "//third_party/tlslite/",
- "//ui/webui/resources/js/",
- "$root_out_dir/pyproto/",
- "$root_out_dir/browser_tests.pak",
- "$root_out_dir/chrome_100_percent.pak",
- "$root_out_dir/chrome_200_percent.pak",
- "$root_out_dir/remoting/unittests/",
- "$root_out_dir/resources/extension/",
- "$root_out_dir/test_case.html",
- "$root_out_dir/test_case.html.mock-http-headers",
- "$root_out_dir/test_data/",
- "$root_out_dir/test_page.css",
- "$root_out_dir/test_page.css.mock-http-headers",
- "$root_out_dir/test_url_loader_data/",
+ deps = [
+ ":test_support",
+ "//base",
+ "//sync:test_support_sync_api",
+ ]
+
+ data_deps = []
+
+ data = []
+
+ defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
+
+ if (is_win) {
+ data += [ "$root_out_dir/chrome_200_percent.pak" ]
+ }
+ if (is_mac) {
+ data += [
+ "$root_out_dir/chrome_material_100_percent.pak",
+ "$root_out_dir/chrome_material_200_percent.pak",
]
- if (is_win) {
- data += [ "$root_out_dir/chrome_200_percent.pak" ]
- }
- if (is_mac) {
- data += [
- "$root_out_dir/chrome_material_100_percent.pak",
- "$root_out_dir/chrome_material_200_percent.pak",
+ }
+ if (is_chromeos) {
+ data += [
+ # TODO(GYP): figure out which of these things are
+ # actually needed and also which should be pulled in via
+ # data or data_deps and through which dependencies.
+ "//chrome/browser/chromeos/login/test/https_forwarder.py",
+ "//chrome/browser/resources/chromeos/wallpaper_manager/",
+ "//chromeos/test/data/",
+ "//components/chrome_apps/webstore_widget/cws_widget/",
+ "//ui/file_manager/file_manager/",
+ "//ui/file_manager/gallery/",
+ "//ui/file_manager/image_loader/",
+ "//ui/file_manager/integration_tests/",
+ "//third_party/analytics/",
+ "//third_party/polymer/v1_0/components-chromium/polymer/",
+ "$root_out_dir/chromevox_test_data/",
+ "$root_out_dir/content_shell.pak",
+ "$root_out_dir/locales/",
+ "$root_out_dir/resources/chromeos/",
+ ]
+
+ data_deps += [ "//ui/keyboard:resources" ]
+
+ if (enable_nacl) {
+ data_deps += [
+ "//components/nacl/loader:nacl_helper",
+ "//ppapi/native_client:irt",
]
}
- if (is_chromeos) {
- data += [
- # TODO(GYP): figure out which of these things are
- # actually needed and also which should be pulled in via
- # data or data_deps and through which dependencies.
- "//chrome/browser/chromeos/login/test/https_forwarder.py",
- "//chrome/browser/resources/chromeos/wallpaper_manager/",
- "//chromeos/test/data/",
- "//components/chrome_apps/webstore_widget/cws_widget/",
- "//ui/file_manager/file_manager/",
- "//ui/file_manager/gallery/",
- "//ui/file_manager/image_loader/",
- "//ui/file_manager/integration_tests/",
- "//third_party/analytics/",
- "//third_party/polymer/v1_0/components-chromium/polymer/",
- "$root_out_dir/chromevox_test_data/",
- "$root_out_dir/content_shell.pak",
- "$root_out_dir/locales/",
- "$root_out_dir/resources/chromeos/",
- ]
+ }
- data_deps = [
- "//ui/keyboard:resources",
- ]
+ # TODO(jbudorick): In progress. See crbug.com/611756
+ if (is_android) {
+ deps += [
+ "//chrome/android:chrome_java",
+ "//v8:v8_external_startup_data_assets",
+ ]
- if (enable_nacl) {
- data_deps += [
- "//components/nacl/loader:nacl_helper",
- "//ppapi/native_client:irt",
- ]
- }
- } else {
- data_deps = []
- }
+ enable_multidex = true
+ } else {
+ sources += rebase_path(
+ chrome_tests_gypi_values.chrome_browser_tests_desktop_only_sources,
+ ".",
+ "//chrome")
- deps = [
+ deps += [
":browser_tests_js_webui",
":sync_integration_test_support",
- ":test_support",
":test_support_ui",
- "//base",
"//base:i18n",
"//base/test:test_support",
"//chrome:browser_tests_pak",
@@ -973,7 +953,6 @@ if (!is_android) {
"//chrome:strings",
"//chrome/browser",
"//chrome/browser/resources:extension_resource_demo",
- "//chrome/common/extensions/api",
"//chrome/renderer",
"//components/autofill/content/browser:risk_proto",
"//components/autofill/content/renderer:test_support",
@@ -993,7 +972,6 @@ if (!is_android) {
"//device/bluetooth:mocks",
"//device/serial:test_support",
"//device/usb:test_support",
- "//extensions/common/api",
"//google_apis:test_support",
"//media",
"//media/base:test_support",
@@ -1003,7 +981,6 @@ if (!is_android) {
"//sdch",
"//skia",
"//sync",
- "//sync:test_support_sync_api",
"//testing/gmock",
"//testing/gtest",
"//testing/perf",
@@ -1021,11 +998,6 @@ if (!is_android) {
"//v8",
]
- # TODO(rockot) bug 505926: The chrome_extensions_browsertests target should
- # be deleted and this line removed. See the chrome_extensions_browsertests
- # target for more.
- deps += [ "//extensions:chrome_extensions_browsertests" ]
-
# Runtime dependencies
data_deps += [
"//chrome",
@@ -1037,13 +1009,48 @@ if (!is_android) {
"//third_party/widevine/cdm:widevine_test_license_server",
]
+ data += [
+ "data/",
+ "//chrome/browser/policy/test/asn1der.py",
+ "//chrome/browser/policy/test/policy_testserver.py",
+ "//chrome/common/extensions/docs/examples/apps/calculator/",
+ "//chrome/third_party/mock4js/",
+ "//content/test/data/",
+ "//google_apis/test/",
+ "//media/test/data/",
+ "//net/tools/testserver/",
+ "//ppapi/tests/test_case.html",
+ "//ppapi/tests/test_case.html.mock-http-headers",
+ "//ppapi/tests/test_page.css",
+ "//ppapi/tests/test_page.css.mock-http-headers",
+ "//testing/test_env.py",
+ "//third_party/accessibility-audit/axs_testing.js",
+ "//third_party/chaijs/chai.js",
+ "//third_party/mocha/mocha.js",
+ "//third_party/pyftpdlib/",
+ "//third_party/pywebsocket/",
+ "//third_party/simplejson/",
+ "//third_party/tlslite/",
+ "//ui/webui/resources/js/",
+ "$root_out_dir/pyproto/",
+ "$root_out_dir/browser_tests.pak",
+ "$root_out_dir/chrome_100_percent.pak",
+ "$root_out_dir/chrome_200_percent.pak",
+ "$root_out_dir/remoting/unittests/",
+ "$root_out_dir/resources/extension/",
+ "$root_out_dir/test_case.html",
+ "$root_out_dir/test_case.html.mock-http-headers",
+ "$root_out_dir/test_data/",
+ "$root_out_dir/test_page.css",
+ "$root_out_dir/test_page.css.mock-http-headers",
+ "$root_out_dir/test_url_loader_data/",
+ ]
+
if (!is_mac) {
data += [ "$root_out_dir/locales/" ]
data_deps += [ "//chrome:packed_extra_resources" ]
}
- defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
-
if (!enable_one_click_signin) {
sources -= [ "../browser/ui/sync/one_click_signin_links_delegate_impl_browsertest.cc" ]
}
@@ -1096,6 +1103,24 @@ if (!is_android) {
]
}
}
+
+ if (enable_extensions) {
+ sources += rebase_path(
+ chrome_tests_gypi_values.chrome_browser_extensions_test_support_sources,
+ ".",
+ "//chrome")
+
+ deps += [
+ "//chrome/common/extensions/api",
+
+ # TODO(rockot) bug 505926: The chrome_extensions_browsertests target
+ # should be deleted and this line removed. See the
+ # chrome_extensions_browsertests target for more.
+ "//extensions:chrome_extensions_browsertests",
+ "//extensions/common/api",
+ ]
+ }
+
if (use_ash) {
sources +=
rebase_path(chrome_tests_gypi_values.chrome_browser_tests_ash_sources,
@@ -1351,14 +1376,6 @@ if (!is_android) {
if (!is_posix || is_chromeos) {
sources -= [ "../common/time_format_browsertest.cc" ]
}
- if (is_android) {
- sources -= [
- "../browser/policy/cloud/component_cloud_policy_browsertest.cc",
- "../browser/prefs/pref_hash_browsertest.cc",
- "../renderer/spellchecker/spellcheck_provider_hunspell_unittest.cc",
- "../renderer/spellchecker/spellcheck_unittest.cc",
- ]
- }
if (is_chromeos) {
sources += [
"../browser/extensions/api/networking_private/networking_private_apitest.cc",
@@ -1450,8 +1467,6 @@ if (!is_android) {
"../renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc",
]
}
- if (is_android || is_ios) {
- }
if (enable_remoting) {
sources += rebase_path(
chrome_tests_gypi_values.chrome_browser_tests_remoting_sources,
@@ -1491,7 +1506,9 @@ if (!is_android) {
}
}
}
+}
+if (!is_android) {
test("sync_integration_tests") {
sources =
rebase_path(chrome_tests_gypi_values.sync_integration_tests_sources,
« no previous file with comments | « chrome/chrome_tests.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698