| OLD | NEW |
| 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/chrome_tests.gni") | 10 import("//chrome/chrome_tests.gni") |
| (...skipping 701 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 712 if (enable_app_list) { | 712 if (enable_app_list) { |
| 713 deps += [ "//ui/app_list:test_support" ] | 713 deps += [ "//ui/app_list:test_support" ] |
| 714 } else { | 714 } else { |
| 715 sources -= [ | 715 sources -= [ |
| 716 "../browser/sync/test/integration/sync_app_list_helper.cc", | 716 "../browser/sync/test/integration/sync_app_list_helper.cc", |
| 717 "../browser/sync/test/integration/sync_app_list_helper.h", | 717 "../browser/sync/test/integration/sync_app_list_helper.h", |
| 718 ] | 718 ] |
| 719 } | 719 } |
| 720 if (!is_chromeos) { | 720 if (!is_chromeos) { |
| 721 sources -= [ | 721 sources -= [ |
| 722 "../browser/sync/test/integration/sync_arc_package_helper.cc", |
| 723 "../browser/sync/test/integration/sync_arc_package_helper.h", |
| 722 "../browser/sync/test/integration/wifi_credentials_helper.cc", | 724 "../browser/sync/test/integration/wifi_credentials_helper.cc", |
| 723 "../browser/sync/test/integration/wifi_credentials_helper.h", | 725 "../browser/sync/test/integration/wifi_credentials_helper.h", |
| 724 ] | 726 ] |
| 725 } | 727 } |
| 728 if (is_chromeos) { |
| 729 deps += [ |
| 730 "//components/arc:arc_test_support", |
| 731 "//components/user_manager:test_support", |
| 732 ] |
| 733 } |
| 726 } | 734 } |
| 727 | 735 |
| 728 js2gtest("browser_tests_js_webui") { | 736 js2gtest("browser_tests_js_webui") { |
| 729 test_type = "webui" | 737 test_type = "webui" |
| 730 sources = rebase_path( | 738 sources = rebase_path( |
| 731 chrome_tests_gypi_values.chrome_browser_tests_webui_js_sources, | 739 chrome_tests_gypi_values.chrome_browser_tests_webui_js_sources, |
| 732 ".", | 740 ".", |
| 733 "//chrome") | 741 "//chrome") |
| 734 if (is_chrome_branded) { | 742 if (is_chrome_branded) { |
| 735 # crbug.com/230471 | 743 # crbug.com/230471 |
| (...skipping 830 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1566 ] | 1574 ] |
| 1567 | 1575 |
| 1568 configs -= [ "//build/config/win:default_incremental_linking" ] | 1576 configs -= [ "//build/config/win:default_incremental_linking" ] |
| 1569 configs += | 1577 configs += |
| 1570 [ "//build/config/win:default_large_module_incremental_linking" ] | 1578 [ "//build/config/win:default_large_module_incremental_linking" ] |
| 1571 } else { | 1579 } else { |
| 1572 sources -= [ "../app/chrome_version.rc.version" ] | 1580 sources -= [ "../app/chrome_version.rc.version" ] |
| 1573 } | 1581 } |
| 1574 if (!is_chromeos) { | 1582 if (!is_chromeos) { |
| 1575 sources -= [ | 1583 sources -= [ |
| 1584 "../browser/sync/test/integration/single_client_arc_package_sync_test.cc
", |
| 1576 "../browser/sync/test/integration/single_client_wifi_credentials_sync_te
st.cc", | 1585 "../browser/sync/test/integration/single_client_wifi_credentials_sync_te
st.cc", |
| 1586 "../browser/sync/test/integration/two_client_arc_package_sync_test.cc", |
| 1577 "../browser/sync/test/integration/two_client_wifi_credentials_sync_test.
cc", | 1587 "../browser/sync/test/integration/two_client_wifi_credentials_sync_test.
cc", |
| 1578 ] | 1588 ] |
| 1579 } | 1589 } |
| 1580 | 1590 |
| 1581 if (toolkit_views) { | 1591 if (toolkit_views) { |
| 1582 deps += [ "//ui/views" ] | 1592 deps += [ "//ui/views" ] |
| 1583 } | 1593 } |
| 1584 if (enable_basic_printing || enable_print_preview) { | 1594 if (enable_basic_printing || enable_print_preview) { |
| 1585 deps += [ "//printing" ] | 1595 deps += [ "//printing" ] |
| 1586 } | 1596 } |
| (...skipping 868 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2455 if (is_android) { | 2465 if (is_android) { |
| 2456 android_library("unit_tests_java") { | 2466 android_library("unit_tests_java") { |
| 2457 java_files = [ "android/unit_tests_apk/src/org/chromium/chrome/unit_tests_ap
k/ChromeNativeTestApplication.java" ] | 2467 java_files = [ "android/unit_tests_apk/src/org/chromium/chrome/unit_tests_ap
k/ChromeNativeTestApplication.java" ] |
| 2458 deps = [ | 2468 deps = [ |
| 2459 "//base:base_java", | 2469 "//base:base_java", |
| 2460 "//chrome/android:chrome_java", | 2470 "//chrome/android:chrome_java", |
| 2461 "//content/public/android:content_java", | 2471 "//content/public/android:content_java", |
| 2462 ] | 2472 ] |
| 2463 } | 2473 } |
| 2464 } | 2474 } |
| OLD | NEW |