| 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/features.gni") | 5 import("//build/config/features.gni") |
| 6 import("//build/config/ui.gni") | 6 import("//build/config/ui.gni") |
| 7 | 7 |
| 8 # This target exists to reference other test executables to bring these files | 8 # This target exists to reference other test executables to bring these files |
| 9 # into the build. | 9 # into the build. |
| 10 group("test") { | 10 group("test") { |
| (...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 310 ".", | 310 ".", |
| 311 "//chrome") | 311 "//chrome") |
| 312 } | 312 } |
| 313 | 313 |
| 314 if (is_chromeos) { | 314 if (is_chromeos) { |
| 315 sources += | 315 sources += |
| 316 rebase_path(gypi_values.chrome_interactive_ui_test_chromeos_sources, | 316 rebase_path(gypi_values.chrome_interactive_ui_test_chromeos_sources, |
| 317 ".", | 317 ".", |
| 318 "//chrome") | 318 "//chrome") |
| 319 sources += [ "../browser/notifications/login_state_notification_blocker_ch
romeos_browsertest.cc" ] | 319 sources += [ "../browser/notifications/login_state_notification_blocker_ch
romeos_browsertest.cc" ] |
| 320 sources -= [ | |
| 321 # Use only the _chromeos version on ChromeOS. | |
| 322 "../test/base/view_event_test_platform_part_ash.cc", | |
| 323 ] | |
| 324 | |
| 325 deps += [ | 320 deps += [ |
| 326 "//ash/resources", | 321 "//ash/resources", |
| 327 "//chromeos", | 322 "//chromeos", |
| 328 ] | 323 ] |
| 329 | 324 |
| 330 if (enable_nacl) { | 325 if (enable_nacl) { |
| 331 # TODO(GYP) this is also under a disable_nacl_untrusted==0 condition. | 326 # TODO(GYP) this is also under a disable_nacl_untrusted==0 condition. |
| 332 deps += [ | 327 deps += [ |
| 333 # '../native_client/src/trusted/service_runtime/linux/nacl_bootstrap.g
yp:nacl_helper_bootstrap', TODO(GYP) | 328 # '../native_client/src/trusted/service_runtime/linux/nacl_bootstrap.g
yp:nacl_helper_bootstrap', TODO(GYP) |
| 334 # '../components/nacl.gyp:nacl_helper', TODO(GYP) | 329 # '../components/nacl.gyp:nacl_helper', TODO(GYP) |
| (...skipping 312 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 647 # TODO(GYP) CDM adapter stuff. | 642 # TODO(GYP) CDM adapter stuff. |
| 648 #if (enable_pepper_cdms) { | 643 #if (enable_pepper_cdms) { |
| 649 # deps += [ | 644 # deps += [ |
| 650 # "//media/cdm/ppapi:clearkeycdmadapter", | 645 # "//media/cdm/ppapi:clearkeycdmadapter", |
| 651 # "//ppapi:ppapi_cpp", | 646 # "//ppapi:ppapi_cpp", |
| 652 # "//third_party/widevine/cdm:adapter", | 647 # "//third_party/widevine/cdm:adapter", |
| 653 # ] | 648 # ] |
| 654 #} | 649 #} |
| 655 } | 650 } |
| 656 } | 651 } |
| OLD | NEW |