| 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/crypto.gni") | 6 import("//build/config/crypto.gni") |
| 7 import("//build/config/features.gni") | 7 import("//build/config/features.gni") |
| 8 import("//build/config/ui.gni") | 8 import("//build/config/ui.gni") |
| 9 import("//media/media_options.gni") | 9 import("//media/media_options.gni") |
| 10 import("//third_party/protobuf/proto_library.gni") | 10 import("//third_party/protobuf/proto_library.gni") |
| (...skipping 548 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 559 } | 559 } |
| 560 if (is_desktop_linux) { | 560 if (is_desktop_linux) { |
| 561 sources += rebase_path(gypi_values.chrome_browser_libsecret_sources, | 561 sources += rebase_path(gypi_values.chrome_browser_libsecret_sources, |
| 562 ".", | 562 ".", |
| 563 "//chrome") | 563 "//chrome") |
| 564 defines += [ "USE_LIBSECRET" ] | 564 defines += [ "USE_LIBSECRET" ] |
| 565 } | 565 } |
| 566 if (use_aura) { | 566 if (use_aura) { |
| 567 sources += | 567 sources += |
| 568 rebase_path(gypi_values.chrome_browser_aura_sources, ".", "//chrome") | 568 rebase_path(gypi_values.chrome_browser_aura_sources, ".", "//chrome") |
| 569 |
| 570 # These files are only built in a GN build because they bring in |
| 571 # dependencies that don't build with GYP. |
| 572 sources += [ |
| 573 "mojo_runner_state.cc", |
| 574 "mojo_runner_state.h", |
| 575 ] |
| 569 deps += [ | 576 deps += [ |
| 577 "//mojo/runner/child:lib", |
| 570 "//ui/aura", | 578 "//ui/aura", |
| 571 "//ui/compositor", | 579 "//ui/compositor", |
| 572 "//ui/keyboard", | 580 "//ui/keyboard", |
| 573 "//ui/keyboard:keyboard_with_content", | 581 "//ui/keyboard:keyboard_with_content", |
| 574 ] | 582 ] |
| 583 defines += [ "MOJO_RUNNER_CLIENT" ] |
| 575 } | 584 } |
| 576 if (ui_compositor_image_transport) { | 585 if (ui_compositor_image_transport) { |
| 577 deps += [ "//ui/gl" ] | 586 deps += [ "//ui/gl" ] |
| 578 } | 587 } |
| 579 | 588 |
| 580 if (use_ash) { | 589 if (use_ash) { |
| 581 sources += | 590 sources += |
| 582 rebase_path(gypi_values.chrome_browser_ash_sources, ".", "//chrome") | 591 rebase_path(gypi_values.chrome_browser_ash_sources, ".", "//chrome") |
| 583 } | 592 } |
| 584 | 593 |
| (...skipping 659 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1244 rebase_path(gypi_values.chrome_browser_rlz_sources, ".", "//chrome") | 1253 rebase_path(gypi_values.chrome_browser_rlz_sources, ".", "//chrome") |
| 1245 deps = [ | 1254 deps = [ |
| 1246 "//components/google/core/browser", | 1255 "//components/google/core/browser", |
| 1247 "//components/omnibox/browser", | 1256 "//components/omnibox/browser", |
| 1248 "//components/rlz", | 1257 "//components/rlz", |
| 1249 "//components/search_engines", | 1258 "//components/search_engines", |
| 1250 "//rlz:rlz_lib", | 1259 "//rlz:rlz_lib", |
| 1251 ] | 1260 ] |
| 1252 } | 1261 } |
| 1253 } | 1262 } |
| OLD | NEW |