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

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

Issue 1994993003: Moves resources used by ash/wm/common to ash/wm/common/resources (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: repack chrome Created 4 years, 7 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
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 452 matching lines...) Expand 10 before | Expand all | Expand 10 after
463 463
464 if (is_chromeos) { 464 if (is_chromeos) {
465 sources += rebase_path( 465 sources += rebase_path(
466 chrome_tests_gypi_values.chrome_interactive_ui_test_chromeos_sourc es, 466 chrome_tests_gypi_values.chrome_interactive_ui_test_chromeos_sourc es,
467 ".", 467 ".",
468 "//chrome") 468 "//chrome")
469 sources += [ "../browser/notifications/login_state_notification_blocker_ch romeos_browsertest.cc" ] 469 sources += [ "../browser/notifications/login_state_notification_blocker_ch romeos_browsertest.cc" ]
470 470
471 deps += [ 471 deps += [
472 "//ash/resources", 472 "//ash/resources",
473 "//ash/wm/common/resources",
473 "//chromeos", 474 "//chromeos",
474 ] 475 ]
475 476
476 if (enable_nacl) { 477 if (enable_nacl) {
477 data_deps += [ 478 data_deps += [
478 "//components/nacl/loader:nacl_helper", 479 "//components/nacl/loader:nacl_helper",
479 "//components/nacl/loader:helper_nonsfi", 480 "//components/nacl/loader:helper_nonsfi",
480 ] 481 ]
481 } 482 }
482 483
(...skipping 1391 matching lines...) Expand 10 before | Expand all | Expand 10 after
1874 } 1875 }
1875 if (use_ash) { 1876 if (use_ash) {
1876 sources += 1877 sources +=
1877 rebase_path(chrome_tests_unit_gypi_values.chrome_unit_tests_ash_sources, 1878 rebase_path(chrome_tests_unit_gypi_values.chrome_unit_tests_ash_sources,
1878 ".", 1879 ".",
1879 "//chrome") 1880 "//chrome")
1880 deps += [ 1881 deps += [
1881 "//ash:test_support", 1882 "//ash:test_support",
1882 "//ash/resources", 1883 "//ash/resources",
1883 "//ash/strings", 1884 "//ash/strings",
1885 "//ash/wm/common/resources",
1884 ] 1886 ]
1885 1887
1886 # We eventually want to compile both in Win Aura builds, see 1888 # We eventually want to compile both in Win Aura builds, see
1887 # http://crbug.com/155545. 1889 # http://crbug.com/155545.
1888 if (!is_win) { 1890 if (!is_win) {
1889 sources -= [ "../browser/ui/window_sizer/window_sizer_unittest.cc" ] 1891 sources -= [ "../browser/ui/window_sizer/window_sizer_unittest.cc" ]
1890 } 1892 }
1891 } 1893 }
1892 if (use_aura) { 1894 if (use_aura) {
1893 deps += [ 1895 deps += [
(...skipping 494 matching lines...) Expand 10 before | Expand all | Expand 10 after
2388 if (is_android) { 2390 if (is_android) {
2389 android_library("unit_tests_java") { 2391 android_library("unit_tests_java") {
2390 java_files = [ "android/unit_tests_apk/src/org/chromium/chrome/unit_tests_ap k/ChromeNativeTestApplication.java" ] 2392 java_files = [ "android/unit_tests_apk/src/org/chromium/chrome/unit_tests_ap k/ChromeNativeTestApplication.java" ]
2391 deps = [ 2393 deps = [
2392 "//base:base_java", 2394 "//base:base_java",
2393 "//chrome/android:chrome_java", 2395 "//chrome/android:chrome_java",
2394 "//content/public/android:content_java", 2396 "//content/public/android:content_java",
2395 ] 2397 ]
2396 } 2398 }
2397 } 2399 }
OLDNEW
« ash/shelf/shelf_widget.cc ('K') | « 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