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

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

Issue 534813002: Remove some rtc hacks in the GN build. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 6 years, 3 months 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 | remoting/base/BUILD.gn » ('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/crypto.gni") 5 import("//build/config/crypto.gni")
6 import("//build/config/features.gni") 6 import("//build/config/features.gni")
7 import("//build/config/ui.gni") 7 import("//build/config/ui.gni")
8 8
9 gypi_values = exec_script( 9 gypi_values = exec_script(
10 "//build/gypi_to_gn.py", 10 "//build/gypi_to_gn.py",
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 "//ui/strings", 73 "//ui/strings",
74 "//url", 74 "//url",
75 "//storage/browser", 75 "//storage/browser",
76 ] 76 ]
77 77
78 forward_dependent_configs_from = [ 78 forward_dependent_configs_from = [
79 "//chrome/common/extensions/api", 79 "//chrome/common/extensions/api",
80 "//content/public/browser", 80 "//content/public/browser",
81 ] 81 ]
82 82
83 # TODO(GYP) This config should be a direct_dependent_config of
84 # //third_party/webrtc/modules/desktop_capture so we shouldn't have to
85 # include it here. Remove this line when the direct_dependent_config is set.
86 configs += [ "//third_party/webrtc:common_inherited_config" ]
87
88 if (is_chromeos) { 83 if (is_chromeos) {
89 sources += rebase_path( 84 sources += rebase_path(
90 gypi_values.chrome_browser_extensions_chromeos_sources, 85 gypi_values.chrome_browser_extensions_chromeos_sources,
91 ".", "//chrome") 86 ".", "//chrome")
92 configs += [ "//build/config/linux:dbus" ] 87 configs += [ "//build/config/linux:dbus" ]
93 deps += [ 88 deps += [
94 "//third_party/libevent", 89 "//third_party/libevent",
95 "//third_party/protobuf:protobuf_lite", 90 "//third_party/protobuf:protobuf_lite",
96 #'../chromeos/ime/input_method.gyp:gencode', TODO(GYP) 91 #'../chromeos/ime/input_method.gyp:gencode', TODO(GYP)
97 ] 92 ]
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
207 gypi_values.chrome_browser_extensions_app_list_sources, 202 gypi_values.chrome_browser_extensions_app_list_sources,
208 ".", "//chrome") 203 ".", "//chrome")
209 } 204 }
210 205
211 if (!use_ozone) { 206 if (!use_ozone) {
212 sources -= [ 207 sources -= [
213 "global_shortcut_listener_ozone.cc", 208 "global_shortcut_listener_ozone.cc",
214 ] 209 ]
215 } 210 }
216 } 211 }
OLDNEW
« no previous file with comments | « no previous file | remoting/base/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698