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

Side by Side Diff: webrtc/build/common.gypi

Issue 1945803003: Revert of Remove the rtc_relative_path GYP variable and similar defines (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 7 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 | « webrtc/base/gunit_prod.h ('k') | webrtc/libjingle/xmllite/xmlbuilder.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 (c) 2012 The WebRTC project authors. All Rights Reserved. 1 # Copyright (c) 2012 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 # This file contains common settings for building WebRTC components. 9 # This file contains common settings for building WebRTC components.
10 10
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 'build_with_chromium%': '<(build_with_chromium)', 57 'build_with_chromium%': '<(build_with_chromium)',
58 'build_with_mozilla%': '<(build_with_mozilla)', 58 'build_with_mozilla%': '<(build_with_mozilla)',
59 'webrtc_root%': '<(webrtc_root)', 59 'webrtc_root%': '<(webrtc_root)',
60 'apk_tests_path%': '<(apk_tests_path)', 60 'apk_tests_path%': '<(apk_tests_path)',
61 'test_runner_path': '<(DEPTH)/webrtc/build/android/test_runner.py', 61 'test_runner_path': '<(DEPTH)/webrtc/build/android/test_runner.py',
62 'modules_java_gyp_path%': '<(modules_java_gyp_path)', 62 'modules_java_gyp_path%': '<(modules_java_gyp_path)',
63 'webrtc_vp8_dir%': '<(webrtc_vp8_dir)', 63 'webrtc_vp8_dir%': '<(webrtc_vp8_dir)',
64 'webrtc_vp9_dir%': '<(webrtc_vp9_dir)', 64 'webrtc_vp9_dir%': '<(webrtc_vp9_dir)',
65 'include_ilbc%': '<(include_ilbc)', 65 'include_ilbc%': '<(include_ilbc)',
66 'include_opus%': '<(include_opus)', 66 'include_opus%': '<(include_opus)',
67 'rtc_relative_path%': 1,
67 'external_libraries%': '0', 68 'external_libraries%': '0',
68 'json_root%': '<(DEPTH)/third_party/jsoncpp/source/include/', 69 'json_root%': '<(DEPTH)/third_party/jsoncpp/source/include/',
69 # openssl needs to be defined or gyp will complain. Is is only used when 70 # openssl needs to be defined or gyp will complain. Is is only used when
70 # when providing external libraries so just use current directory as a 71 # when providing external libraries so just use current directory as a
71 # placeholder. 72 # placeholder.
72 'ssl_root%': '.', 73 'ssl_root%': '.',
73 74
74 # The Chromium common.gypi we use treats all gyp files without 75 # The Chromium common.gypi we use treats all gyp files without
75 # chromium_code==1 as third party code. This disables many of the 76 # chromium_code==1 as third party code. This disables many of the
76 # preferred warning settings. 77 # preferred warning settings.
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
230 ], 231 ],
231 }], 232 }],
232 ['have_dbus_glib==1', { 233 ['have_dbus_glib==1', {
233 'defines': [ 234 'defines': [
234 'HAVE_DBUS_GLIB', 235 'HAVE_DBUS_GLIB',
235 ], 236 ],
236 'cflags': [ 237 'cflags': [
237 '<!@(pkg-config --cflags dbus-glib-1)', 238 '<!@(pkg-config --cflags dbus-glib-1)',
238 ], 239 ],
239 }], 240 }],
241 ['rtc_relative_path==1', {
242 'defines': ['EXPAT_RELATIVE_PATH',],
243 }],
240 ['os_posix==1', { 244 ['os_posix==1', {
241 'configurations': { 245 'configurations': {
242 'Debug_Base': { 246 'Debug_Base': {
243 'defines': [ 247 'defines': [
244 # Chromium's build/common.gypi defines _DEBUG for all posix 248 # Chromium's build/common.gypi defines _DEBUG for all posix
245 # _except_ for ios & mac. The size of data types such as 249 # _except_ for ios & mac. The size of data types such as
246 # pthread_mutex_t varies between release and debug builds 250 # pthread_mutex_t varies between release and debug builds
247 # and is controlled via this flag. Since we now share code 251 # and is controlled via this flag. Since we now share code
248 # between base/base.gyp and build/common.gypi (this file), 252 # between base/base.gyp and build/common.gypi (this file),
249 # both gyp(i) files, must consistently set this flag uniformly 253 # both gyp(i) files, must consistently set this flag uniformly
(...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after
498 # For access to standard POSIXish features, use WEBRTC_POSIX instead 502 # For access to standard POSIXish features, use WEBRTC_POSIX instead
499 # of a more specific macro. 503 # of a more specific macro.
500 'defines': [ 504 'defines': [
501 'WEBRTC_POSIX', 505 'WEBRTC_POSIX',
502 ], 506 ],
503 }], 507 }],
504 ], 508 ],
505 }, 509 },
506 }, # target_defaults 510 }, # target_defaults
507 } 511 }
OLDNEW
« no previous file with comments | « webrtc/base/gunit_prod.h ('k') | webrtc/libjingle/xmllite/xmlbuilder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698