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

Side by Side Diff: chrome/test/BUILD.gn

Issue 2355073002: Remove non-existent .pak for OS=mac in browser_tests (Closed)
Patch Set: rebase Created 4 years, 3 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import("//build/config/chrome_build.gni") 5 import("//build/config/chrome_build.gni")
6 import("//build/config/compiler/compiler.gni") 6 import("//build/config/compiler/compiler.gni")
7 import("//build/config/crypto.gni") 7 import("//build/config/crypto.gni")
8 import("//build/config/features.gni") 8 import("//build/config/features.gni")
9 import("//build/config/ui.gni") 9 import("//build/config/ui.gni")
10 import("//chrome/common/features.gni") 10 import("//chrome/common/features.gni")
(...skipping 430 matching lines...) Expand 10 before | Expand all | Expand 10 after
441 "//third_party/tlslite/", 441 "//third_party/tlslite/",
442 "//third_party/zlib/google/test/data/", 442 "//third_party/zlib/google/test/data/",
443 "//tools/metrics/histograms/histograms.xml", 443 "//tools/metrics/histograms/histograms.xml",
444 "$root_out_dir/pyproto/google/", 444 "$root_out_dir/pyproto/google/",
445 "$root_out_dir/test_case.html", 445 "$root_out_dir/test_case.html",
446 "$root_out_dir/test_case.html.mock-http-headers", 446 "$root_out_dir/test_case.html.mock-http-headers",
447 "$root_out_dir/test_page.css", 447 "$root_out_dir/test_page.css",
448 "$root_out_dir/test_page.css.mock-http-headers", 448 "$root_out_dir/test_page.css.mock-http-headers",
449 "$root_out_dir/ui_test.pak", 449 "$root_out_dir/ui_test.pak",
450 ] 450 ]
451 if (is_linux || is_win) { 451 if (is_linux || is_win) {
Nico 2016/09/21 15:11:31 1
452 data += [ 452 data += [
453 "$root_out_dir/chrome_100_percent.pak", 453 "$root_out_dir/chrome_100_percent.pak",
454 "$root_out_dir/chrome_200_percent.pak", 454 "$root_out_dir/chrome_200_percent.pak",
455 "$root_out_dir/locales/en-US.pak", 455 "$root_out_dir/locales/en-US.pak",
456 "$root_out_dir/locales/fr.pak", 456 "$root_out_dir/locales/fr.pak",
457 ] 457 ]
458 } 458 }
459 if (is_linux) { 459 if (is_linux) {
460 data += [ "$root_out_dir/libppapi_tests.so" ] 460 data += [ "$root_out_dir/libppapi_tests.so" ]
461 } 461 }
(...skipping 1090 matching lines...) Expand 10 before | Expand all | Expand 10 after
1552 "../browser/importer/firefox_importer_browsertest.cc", 1552 "../browser/importer/firefox_importer_browsertest.cc",
1553 "../browser/importer/ie_importer_browsertest_win.cc", 1553 "../browser/importer/ie_importer_browsertest_win.cc",
1554 "../browser/importer/importer_unittest_utils.cc", 1554 "../browser/importer/importer_unittest_utils.cc",
1555 "../browser/importer/importer_unittest_utils.h", 1555 "../browser/importer/importer_unittest_utils.h",
1556 "../browser/infobars/infobars_browsertest.cc", 1556 "../browser/infobars/infobars_browsertest.cc",
1557 "../browser/installable/installable_manager_browsertest.cc", 1557 "../browser/installable/installable_manager_browsertest.cc",
1558 "../browser/interstitials/security_interstitial_page_test_utils.cc", 1558 "../browser/interstitials/security_interstitial_page_test_utils.cc",
1559 "../browser/interstitials/security_interstitial_page_test_utils.h", 1559 "../browser/interstitials/security_interstitial_page_test_utils.h",
1560 "../browser/invalidation/profile_invalidation_provider_factory_browsertest .cc", 1560 "../browser/invalidation/profile_invalidation_provider_factory_browsertest .cc",
1561 "../browser/lifetime/browser_close_manager_browsertest.cc", 1561 "../browser/lifetime/browser_close_manager_browsertest.cc",
1562 "../browser/loader/chrome_resource_dispatcher_host_delegate_browsertest.cc ",
1562 "../browser/loadtimes_extension_bindings_browsertest.cc", 1563 "../browser/loadtimes_extension_bindings_browsertest.cc",
1563 "../browser/loader/chrome_resource_dispatcher_host_delegate_browsertest.cc ",
1564 "../browser/locale_tests_browsertest.cc", 1564 "../browser/locale_tests_browsertest.cc",
1565 "../browser/media/defer_background_media_browsertest.cc", 1565 "../browser/media/defer_background_media_browsertest.cc",
1566 "../browser/media/encrypted_media_browsertest.cc", 1566 "../browser/media/encrypted_media_browsertest.cc",
1567 "../browser/media/encrypted_media_supported_types_browsertest.cc", 1567 "../browser/media/encrypted_media_supported_types_browsertest.cc",
1568 "../browser/media/media_browsertest.cc", 1568 "../browser/media/media_browsertest.cc",
1569 "../browser/media/media_browsertest.h", 1569 "../browser/media/media_browsertest.h",
1570 "../browser/media/test_license_server.cc", 1570 "../browser/media/test_license_server.cc",
1571 "../browser/media/test_license_server.h", 1571 "../browser/media/test_license_server.h",
1572 "../browser/media/test_license_server_config.h", 1572 "../browser/media/test_license_server_config.h",
1573 "../browser/media/webrtc/media_stream_devices_controller_browsertest.cc", 1573 "../browser/media/webrtc/media_stream_devices_controller_browsertest.cc",
(...skipping 363 matching lines...) Expand 10 before | Expand all | Expand 10 after
1937 "//third_party/accessibility-audit/axs_testing.js", 1937 "//third_party/accessibility-audit/axs_testing.js",
1938 "//third_party/chaijs/chai.js", 1938 "//third_party/chaijs/chai.js",
1939 "//third_party/mocha/mocha.js", 1939 "//third_party/mocha/mocha.js",
1940 "//third_party/pyftpdlib/", 1940 "//third_party/pyftpdlib/",
1941 "//third_party/pywebsocket/", 1941 "//third_party/pywebsocket/",
1942 "//third_party/simplejson/", 1942 "//third_party/simplejson/",
1943 "//third_party/tlslite/", 1943 "//third_party/tlslite/",
1944 "//ui/webui/resources/js/", 1944 "//ui/webui/resources/js/",
1945 "$root_out_dir/pyproto/", 1945 "$root_out_dir/pyproto/",
1946 "$root_out_dir/browser_tests.pak", 1946 "$root_out_dir/browser_tests.pak",
1947 "$root_out_dir/chrome_100_percent.pak",
1948 "$root_out_dir/chrome_200_percent.pak",
1949 "$root_out_dir/remoting/unittests/", 1947 "$root_out_dir/remoting/unittests/",
1950 "$root_out_dir/resources/extension/", 1948 "$root_out_dir/resources/extension/",
1951 "$root_out_dir/test_case.html", 1949 "$root_out_dir/test_case.html",
1952 "$root_out_dir/test_case.html.mock-http-headers", 1950 "$root_out_dir/test_case.html.mock-http-headers",
1953 "$root_out_dir/test_data/", 1951 "$root_out_dir/test_data/",
1954 "$root_out_dir/test_page.css", 1952 "$root_out_dir/test_page.css",
1955 "$root_out_dir/test_page.css.mock-http-headers", 1953 "$root_out_dir/test_page.css.mock-http-headers",
1956 "$root_out_dir/test_url_loader_data/", 1954 "$root_out_dir/test_url_loader_data/",
1957 ] 1955 ]
1958 1956
1959 if (!is_mac) { 1957 if (!is_mac) {
Nico 2016/09/21 15:11:31 2
1960 data += [ "$root_out_dir/locales/" ] 1958 data += [
1961 data_deps += [ "//chrome:packed_extra_resources" ] 1959 "$root_out_dir/locales/",
1960 "$root_out_dir/chrome_100_percent.pak",
1961 "$root_out_dir/chrome_200_percent.pak",
1962 "$root_out_dir/resources.pak",
1963 ]
1962 } 1964 }
1963 1965
1964 if (!enable_one_click_signin) { 1966 if (!enable_one_click_signin) {
1965 sources -= [ "../browser/ui/sync/one_click_signin_links_delegate_impl_brow sertest.cc" ] 1967 sources -= [ "../browser/ui/sync/one_click_signin_links_delegate_impl_brow sertest.cc" ]
1966 } 1968 }
1967 if (enable_nacl) { 1969 if (enable_nacl) {
1968 sources += [ 1970 sources += [
1969 "../browser/chrome_service_worker_browsertest.cc", 1971 "../browser/chrome_service_worker_browsertest.cc",
1970 "../browser/extensions/extension_nacl_browsertest.cc", 1972 "../browser/extensions/extension_nacl_browsertest.cc",
1971 "../browser/nacl_host/test/gdb_debug_stub_browsertest.cc", 1973 "../browser/nacl_host/test/gdb_debug_stub_browsertest.cc",
(...skipping 739 matching lines...) Expand 10 before | Expand all | Expand 10 after
2711 data = [ 2713 data = [
2712 "//chrome/test/data/sync/", 2714 "//chrome/test/data/sync/",
2713 "//net/tools/testserver/", 2715 "//net/tools/testserver/",
2714 "//components/sync/tools/testserver/", 2716 "//components/sync/tools/testserver/",
2715 "//third_party/pyftpdlib/", 2717 "//third_party/pyftpdlib/",
2716 "//third_party/pywebsocket/", 2718 "//third_party/pywebsocket/",
2717 "//third_party/tlslite/", 2719 "//third_party/tlslite/",
2718 "$root_out_dir/pyproto/", 2720 "$root_out_dir/pyproto/",
2719 ] 2721 ]
2720 2722
2721 if (is_linux || is_win) { 2723 if (is_linux || is_win) {
Nico 2016/09/21 15:11:31 3
2722 data += [ 2724 data += [
2723 "$root_out_dir/chrome_100_percent.pak", 2725 "$root_out_dir/chrome_100_percent.pak",
2724 "$root_out_dir/chrome_200_percent.pak", 2726 "$root_out_dir/chrome_200_percent.pak",
2725 "$root_out_dir/locales/en-US.pak", 2727 "$root_out_dir/locales/en-US.pak",
2726 ] 2728 ]
2727 } 2729 }
2728 2730
2729 # TODO(phajdan.jr): Only temporary, to make transition easier. 2731 # TODO(phajdan.jr): Only temporary, to make transition easier.
2730 defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ] 2732 defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
2731 2733
(...skipping 621 matching lines...) Expand 10 before | Expand all | Expand 10 after
3353 "//third_party/accessibility-audit/axs_testing.js", 3355 "//third_party/accessibility-audit/axs_testing.js",
3354 "//third_party/chaijs/chai.js", 3356 "//third_party/chaijs/chai.js",
3355 "//third_party/hunspell_dictionaries/", 3357 "//third_party/hunspell_dictionaries/",
3356 "//third_party/pyftpdlib/", 3358 "//third_party/pyftpdlib/",
3357 "//third_party/pywebsocket/", 3359 "//third_party/pywebsocket/",
3358 "//third_party/tlslite/", 3360 "//third_party/tlslite/",
3359 "//third_party/zlib/google/test/data/", 3361 "//third_party/zlib/google/test/data/",
3360 "//tools/metrics/histograms/histograms.xml", 3362 "//tools/metrics/histograms/histograms.xml",
3361 "$root_out_dir/pyproto/google/", 3363 "$root_out_dir/pyproto/google/",
3362 ] 3364 ]
3363 if (is_android || is_linux || is_win) { 3365 if (is_android || is_linux || is_win) {
Nico 2016/09/21 15:11:31 4
3364 data += [ 3366 data += [
3365 "$root_out_dir/chrome_100_percent.pak", 3367 "$root_out_dir/chrome_100_percent.pak",
3366 "$root_out_dir/locales/en-US.pak", 3368 "$root_out_dir/locales/en-US.pak",
3367 ] 3369 ]
3368 } 3370 }
3369 if (is_linux || is_win) { 3371 if (is_linux || is_win) {
3370 data += [ "$root_out_dir/chrome_200_percent.pak" ] 3372 data += [ "$root_out_dir/chrome_200_percent.pak" ]
3371 } 3373 }
3372 3374
3373 defines = [] 3375 defines = []
(...skipping 1632 matching lines...) Expand 10 before | Expand all | Expand 10 after
5006 "touch_hud", 5008 "touch_hud",
5007 "ui", 5009 "ui",
5008 ] 5010 ]
5009 5011
5010 if (is_linux && !is_android) { 5012 if (is_linux && !is_android) {
5011 deps += [ "//components/font_service:manifest" ] 5013 deps += [ "//components/font_service:manifest" ]
5012 packaged_services += [ "font_service" ] 5014 packaged_services += [ "font_service" ]
5013 } 5015 }
5014 } 5016 }
5015 } 5017 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698