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

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

Issue 1425113003: media: Register MojoMediaApplication to run in Utility process. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: comments addressed Created 5 years, 1 month 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
« no previous file with comments | « no previous file | chrome/browser/chrome_content_browser_client.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/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("//third_party/protobuf/proto_library.gni") 10 import("//third_party/protobuf/proto_library.gni")
10 11
11 # //build/config/android/rules.gni imports //tools/grit/grit_rule.gni, which 12 # //build/config/android/rules.gni imports //tools/grit/grit_rule.gni, which
12 # produces a conflict for the "grit" template so we have to only include one. 13 # produces a conflict for the "grit" template so we have to only include one.
13 if (is_android) { 14 if (is_android) {
14 import("//build/config/android/rules.gni") 15 import("//build/config/android/rules.gni")
15 } else { 16 } else {
16 import("//tools/grit/grit_rule.gni") 17 import("//tools/grit/grit_rule.gni")
17 } 18 }
18 if (is_desktop_linux) { 19 if (is_desktop_linux) {
(...skipping 859 matching lines...) Expand 10 before | Expand all | Expand 10 after
878 # and Mac, so this test is meaningless. Can we merge these lists? 879 # and Mac, so this test is meaningless. Can we merge these lists?
879 sources += rebase_path( 880 sources += rebase_path(
880 gypi_values.chrome_browser_wifi_bootstrapping_win_mac_sources, 881 gypi_values.chrome_browser_wifi_bootstrapping_win_mac_sources,
881 ".", 882 ".",
882 "//chrome") 883 "//chrome")
883 } 884 }
884 } 885 }
885 if (enable_media_router) { 886 if (enable_media_router) {
886 deps += [ "//chrome/browser/media/router" ] 887 deps += [ "//chrome/browser/media/router" ]
887 } 888 }
889
890 if (enable_mojo_media != "none") {
891 configs += [ "//media/mojo/services:enable_mojo_media_config" ]
892 }
893
894 if (enable_mojo_media == "utility") {
895 deps += [ "//media/mojo/services:application" ]
896 }
888 } 897 }
889 898
890 if (is_android) { 899 if (is_android) {
891 # GYP version: chrome/chrome_browser.gypi:chrome_browser_jni_headers 900 # GYP version: chrome/chrome_browser.gypi:chrome_browser_jni_headers
892 generate_jni("jni_headers") { 901 generate_jni("jni_headers") {
893 sources = 902 sources =
894 rebase_path(gypi_values.chrome_browser_jni_sources, ".", "//chrome") 903 rebase_path(gypi_values.chrome_browser_jni_sources, ".", "//chrome")
895 jni_package = "chrome" 904 jni_package = "chrome"
896 } 905 }
897 906
(...skipping 356 matching lines...) Expand 10 before | Expand all | Expand 10 after
1254 rebase_path(gypi_values.chrome_browser_rlz_sources, ".", "//chrome") 1263 rebase_path(gypi_values.chrome_browser_rlz_sources, ".", "//chrome")
1255 deps = [ 1264 deps = [
1256 "//components/google/core/browser", 1265 "//components/google/core/browser",
1257 "//components/omnibox/browser", 1266 "//components/omnibox/browser",
1258 "//components/rlz", 1267 "//components/rlz",
1259 "//components/search_engines", 1268 "//components/search_engines",
1260 "//rlz:rlz_lib", 1269 "//rlz:rlz_lib",
1261 ] 1270 ]
1262 } 1271 }
1263 } 1272 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chrome_content_browser_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698