| 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 # TODO(rockot) bug 505926: Don't include chrome files from here. | 5 # TODO(rockot) bug 505926: Don't include chrome files from here. |
| 6 # See chrome_browser_tests_extensions_sources below | 6 # See chrome_browser_tests_extensions_sources below |
| 7 import("//chrome/chrome_tests.gni") | 7 import("//chrome/chrome_tests.gni") |
| 8 import("//extensions/extensions.gni") | 8 import("//extensions/extensions.gni") |
| 9 import("//testing/test.gni") | 9 import("//testing/test.gni") |
| 10 import("//tools/grit/grit_rule.gni") | 10 import("//tools/grit/grit_rule.gni") |
| (...skipping 233 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 244 "//mojo/edk/system", | 244 "//mojo/edk/system", |
| 245 "//mojo/public/cpp/bindings", | 245 "//mojo/public/cpp/bindings", |
| 246 "//testing/gmock", | 246 "//testing/gmock", |
| 247 "//testing/gtest", | 247 "//testing/gtest", |
| 248 ] | 248 ] |
| 249 | 249 |
| 250 data_deps = [ | 250 data_deps = [ |
| 251 "//third_party/mesa:osmesa", | 251 "//third_party/mesa:osmesa", |
| 252 ] | 252 ] |
| 253 | 253 |
| 254 if (is_win) { | |
| 255 if (target_cpu == "x86") { | |
| 256 data_deps += [ | |
| 257 # "$root_out_dir/wow_helper.exe" # TODO(GYP) | |
| 258 ] | |
| 259 } | |
| 260 } | |
| 261 | |
| 262 if (is_mac) { | 254 if (is_mac) { |
| 263 deps += [ "shell:app_shell" ] # Needed for App Shell.app's Helper. | 255 deps += [ "shell:app_shell" ] # Needed for App Shell.app's Helper. |
| 264 } | 256 } |
| 265 } | 257 } |
| 266 | 258 |
| 267 # TODO(rockot) bug 505926: These should be moved to extensions_browsertests but
have | 259 # TODO(rockot) bug 505926: These should be moved to extensions_browsertests but
have |
| 268 # old dependencies on chrome files. The chrome dependencies should be removed | 260 # old dependencies on chrome files. The chrome dependencies should be removed |
| 269 # and these moved to the extensions_browsertests target. Currently, we solve | 261 # and these moved to the extensions_browsertests target. Currently, we solve |
| 270 # the problem by making this a source set and linking it into | 262 # the problem by making this a source set and linking it into |
| 271 # //chrome/test:browser_tests. | 263 # //chrome/test:browser_tests. |
| (...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 368 "//testing/gtest", | 360 "//testing/gtest", |
| 369 "//third_party/hunspell", | 361 "//third_party/hunspell", |
| 370 "//third_party/icu", | 362 "//third_party/icu", |
| 371 "//third_party/libpng", | 363 "//third_party/libpng", |
| 372 "//third_party/zlib", | 364 "//third_party/zlib", |
| 373 "//ui/base:test_support", | 365 "//ui/base:test_support", |
| 374 "//ui/resources:ui_test_pak", | 366 "//ui/resources:ui_test_pak", |
| 375 "//ui/web_dialogs:test_support", | 367 "//ui/web_dialogs:test_support", |
| 376 ] | 368 ] |
| 377 } | 369 } |
| OLD | NEW |