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

Side by Side Diff: webrtc/BUILD.gn

Issue 1354933002: Update build files to use webrtc_overrides in Chromium instead of overrides. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebase. Created 5 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 | webrtc/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 (c) 2014 The WebRTC project authors. All Rights Reserved. 1 # Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
2 # 2 #
3 # Use of this source code is governed by a BSD-style license 3 # Use of this source code is governed by a BSD-style license
4 # that can be found in the LICENSE file in the root of the source 4 # that can be found in the LICENSE file in the root of the source
5 # tree. An additional intellectual property rights grant can be found 5 # tree. An additional intellectual property rights grant can be found
6 # in the file PATENTS. All contributing project authors may 6 # in the file PATENTS. All contributing project authors may
7 # be found in the AUTHORS file in the root of the source tree. 7 # be found in the AUTHORS file in the root of the source tree.
8 8
9 # TODO(kjellander): Rebase this to webrtc/build/common.gypi changes after r6330. 9 # TODO(kjellander): Rebase this to webrtc/build/common.gypi changes after r6330.
10 10
11 import("//build/config/crypto.gni") 11 import("//build/config/crypto.gni")
12 import("//build/config/linux/pkg_config.gni") 12 import("//build/config/linux/pkg_config.gni")
13 import("build/webrtc.gni") 13 import("build/webrtc.gni")
14 import("//third_party/protobuf/proto_library.gni") 14 import("//third_party/protobuf/proto_library.gni")
15 15
16 # Contains the defines and includes in common.gypi that are duplicated both as 16 # Contains the defines and includes in common.gypi that are duplicated both as
17 # target_defaults and direct_dependent_settings. 17 # target_defaults and direct_dependent_settings.
18 config("common_inherited_config") { 18 config("common_inherited_config") {
19 defines = [] 19 defines = []
20 if (build_with_mozilla) { 20 if (build_with_mozilla) {
21 defines += [ "WEBRTC_MOZILLA_BUILD" ] 21 defines += [ "WEBRTC_MOZILLA_BUILD" ]
22 } 22 }
23 if (build_with_chromium) { 23 if (build_with_chromium) {
24 defines = [ "WEBRTC_CHROMIUM_BUILD" ] 24 defines = [ "WEBRTC_CHROMIUM_BUILD" ]
25 include_dirs = [ 25 include_dirs = [
26 # overrides must be included first as that is the mechanism for 26 # The overrides must be included first as that is the mechanism for
27 # selecting the override headers in Chromium. 27 # selecting the override headers in Chromium.
28 "overrides", 28 "../webrtc_overrides",
29 29
30 # Allow includes to be prefixed with webrtc/ in case it is not an 30 # Allow includes to be prefixed with webrtc/ in case it is not an
31 # immediate subdirectory of the top-level. 31 # immediate subdirectory of the top-level.
32 "..", 32 "..",
33 ] 33 ]
34 } 34 }
35 if (is_posix) { 35 if (is_posix) {
36 defines += [ "WEBRTC_POSIX" ] 36 defines += [ "WEBRTC_POSIX" ]
37 } 37 }
38 if (is_ios) { 38 if (is_ios) {
(...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after
274 if (rtc_enable_protobuf) { 274 if (rtc_enable_protobuf) {
275 defines += [ "ENABLE_RTC_EVENT_LOG" ] 275 defines += [ "ENABLE_RTC_EVENT_LOG" ]
276 deps += [ ":rtc_event_log_proto" ] 276 deps += [ ":rtc_event_log_proto" ]
277 } 277 }
278 if (is_clang && !is_nacl) { 278 if (is_clang && !is_nacl) {
279 # Suppress warnings from Chrome's Clang plugins. 279 # Suppress warnings from Chrome's Clang plugins.
280 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. 280 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details.
281 configs -= [ "//build/config/clang:find_bad_constructs" ] 281 configs -= [ "//build/config/clang:find_bad_constructs" ]
282 } 282 }
283 } 283 }
OLDNEW
« no previous file with comments | « no previous file | webrtc/base/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698