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

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

Issue 2026973002: Moves ash/wm/common/resources back to ash (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: delete revived file Created 4 years, 6 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 | « chrome/chrome_tests_unit.gypi ('k') | mash/wm/BUILD.gn » ('j') | 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/chrome_tests.gni") 10 import("//chrome/chrome_tests.gni")
(...skipping 451 matching lines...) Expand 10 before | Expand all | Expand 10 after
462 462
463 if (is_chromeos) { 463 if (is_chromeos) {
464 sources += rebase_path( 464 sources += rebase_path(
465 chrome_tests_gypi_values.chrome_interactive_ui_test_chromeos_sourc es, 465 chrome_tests_gypi_values.chrome_interactive_ui_test_chromeos_sourc es,
466 ".", 466 ".",
467 "//chrome") 467 "//chrome")
468 sources += [ "../browser/notifications/login_state_notification_blocker_ch romeos_browsertest.cc" ] 468 sources += [ "../browser/notifications/login_state_notification_blocker_ch romeos_browsertest.cc" ]
469 469
470 deps += [ 470 deps += [
471 "//ash/resources", 471 "//ash/resources",
472 "//ash/wm/common/resources",
473 "//chromeos", 472 "//chromeos",
474 ] 473 ]
475 474
476 if (enable_nacl) { 475 if (enable_nacl) {
477 data_deps += [ 476 data_deps += [
478 "//components/nacl/loader:nacl_helper", 477 "//components/nacl/loader:nacl_helper",
479 "//components/nacl/loader:helper_nonsfi", 478 "//components/nacl/loader:helper_nonsfi",
480 ] 479 ]
481 } 480 }
482 481
(...skipping 1390 matching lines...) Expand 10 before | Expand all | Expand 10 after
1873 } 1872 }
1874 if (use_ash) { 1873 if (use_ash) {
1875 sources += 1874 sources +=
1876 rebase_path(chrome_tests_unit_gypi_values.chrome_unit_tests_ash_sources, 1875 rebase_path(chrome_tests_unit_gypi_values.chrome_unit_tests_ash_sources,
1877 ".", 1876 ".",
1878 "//chrome") 1877 "//chrome")
1879 deps += [ 1878 deps += [
1880 "//ash:test_support", 1879 "//ash:test_support",
1881 "//ash/resources", 1880 "//ash/resources",
1882 "//ash/strings", 1881 "//ash/strings",
1883 "//ash/wm/common/resources",
1884 ] 1882 ]
1885 1883
1886 # We eventually want to compile both in Win Aura builds, see 1884 # We eventually want to compile both in Win Aura builds, see
1887 # http://crbug.com/155545. 1885 # http://crbug.com/155545.
1888 if (!is_win) { 1886 if (!is_win) {
1889 sources -= [ "../browser/ui/window_sizer/window_sizer_unittest.cc" ] 1887 sources -= [ "../browser/ui/window_sizer/window_sizer_unittest.cc" ]
1890 } 1888 }
1891 } 1889 }
1892 if (use_aura) { 1890 if (use_aura) {
1893 deps += [ 1891 deps += [
(...skipping 491 matching lines...) Expand 10 before | Expand all | Expand 10 after
2385 if (is_android) { 2383 if (is_android) {
2386 android_library("unit_tests_java") { 2384 android_library("unit_tests_java") {
2387 java_files = [ "android/unit_tests_apk/src/org/chromium/chrome/unit_tests_ap k/ChromeNativeTestApplication.java" ] 2385 java_files = [ "android/unit_tests_apk/src/org/chromium/chrome/unit_tests_ap k/ChromeNativeTestApplication.java" ]
2388 deps = [ 2386 deps = [
2389 "//base:base_java", 2387 "//base:base_java",
2390 "//chrome/android:chrome_java", 2388 "//chrome/android:chrome_java",
2391 "//content/public/android:content_java", 2389 "//content/public/android:content_java",
2392 ] 2390 ]
2393 } 2391 }
2394 } 2392 }
OLDNEW
« no previous file with comments | « chrome/chrome_tests_unit.gypi ('k') | mash/wm/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698