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