Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 { | 1 { |
| 2 'variables': { | 2 'variables': { |
| 3 'variables': { | 3 'variables': { |
| 4 'webrtc_root%': '<(DEPTH)/webrtc', | 4 'webrtc_root%': '<(DEPTH)/webrtc', |
| 5 # Override the defaults in Chromium's build/common.gypi. | 5 # Override the defaults in Chromium's build/common.gypi. |
| 6 # Needed for ARC and libc++. | 6 # Needed for ARC and libc++. |
| 7 'mac_sdk_min%': '10.11', | 7 'mac_sdk_min%': '10.11', |
| 8 'mac_deployment_target%': '10.7', | 8 'mac_deployment_target%': '10.7', |
| 9 }, | 9 }, |
| 10 'webrtc_root%': '<(webrtc_root)', | 10 'webrtc_root%': '<(webrtc_root)', |
| 11 'mac_deployment_target%': '<(mac_deployment_target)', | 11 'mac_deployment_target%': '<(mac_deployment_target)', |
| 12 'use_sysroot%': '<(use_sysroot)', | 12 'use_sysroot%': '<(use_sysroot)', |
| 13 'build_with_chromium': 0, | 13 'build_with_chromium': 0, |
| 14 'conditions': [ | 14 'conditions': [ |
| 15 ['OS=="ios"', { | 15 ['OS=="ios"', { |
| 16 # Set target_subarch for if not already set. This is needed because the | 16 # Set target_subarch for if not already set. This is needed because the |
| 17 # Chromium iOS toolchain relies on target_subarch being set. | 17 # Chromium iOS toolchain relies on target_subarch being set. |
| 18 'conditions': [ | 18 'conditions': [ |
| 19 ['target_arch=="arm" or target_arch=="ia32"', { | 19 ['target_arch=="arm" or target_arch=="ia32"', { |
| 20 'target_subarch%': 'arm32', | 20 'target_subarch%': 'arm32', |
| 21 }], | 21 }], |
| 22 ['target_arch=="arm64" or target_arch=="x64"', { | 22 ['target_arch=="arm64" or target_arch=="x64"', { |
| 23 'target_subarch%': 'arm64', | 23 'target_subarch%': 'arm64', |
| 24 }], | 24 }], |
| 25 ], | 25 ], |
| 26 }], | 26 }], |
| 27 ['OS=="android"', { | |
| 28 # MJPEG capture is not used on Android. Disable to reduce | |
| 29 # libjingle_peerconnection_so file size. | |
| 30 'libyuv_disable_jpeg%': 1, | |
|
kjellander_webrtc
2016/05/16 14:23:22
You only need to put a variable in supplement.gypi
magjed_webrtc
2016/05/17 08:45:56
I tried moving it to webrtc/build/common.gypi, but
kjellander_webrtc
2016/05/17 14:07:49
Oh dear, GYP trickery. We chatted offline and came
| |
| 31 }], | |
| 27 ], | 32 ], |
| 28 }, | 33 }, |
| 29 'target_defaults': { | 34 'target_defaults': { |
| 30 'target_conditions': [ | 35 'target_conditions': [ |
| 31 ['_target_name=="sanitizer_options"', { | 36 ['_target_name=="sanitizer_options"', { |
| 32 'conditions': [ | 37 'conditions': [ |
| 33 ['lsan==1', { | 38 ['lsan==1', { |
| 34 # Replace Chromium's LSan suppressions with our own for WebRTC. | 39 # Replace Chromium's LSan suppressions with our own for WebRTC. |
| 35 'sources/': [ | 40 'sources/': [ |
| 36 ['exclude', 'lsan_suppressions.cc'], | 41 ['exclude', 'lsan_suppressions.cc'], |
| 37 ], | 42 ], |
| 38 'sources': [ | 43 'sources': [ |
| 39 '<(webrtc_root)/build/sanitizers/lsan_suppressions_webrtc.cc', | 44 '<(webrtc_root)/build/sanitizers/lsan_suppressions_webrtc.cc', |
| 40 ], | 45 ], |
| 41 }], | 46 }], |
| 42 ['tsan==1', { | 47 ['tsan==1', { |
| 43 # Replace Chromium's TSan v2 suppressions with our own for WebRTC. | 48 # Replace Chromium's TSan v2 suppressions with our own for WebRTC. |
| 44 'sources/': [ | 49 'sources/': [ |
| 45 ['exclude', 'tsan_suppressions.cc'], | 50 ['exclude', 'tsan_suppressions.cc'], |
| 46 ], | 51 ], |
| 47 'sources': [ | 52 'sources': [ |
| 48 '<(webrtc_root)/build/sanitizers/tsan_suppressions_webrtc.cc', | 53 '<(webrtc_root)/build/sanitizers/tsan_suppressions_webrtc.cc', |
| 49 ], | 54 ], |
| 50 }], | 55 }], |
| 51 ], | 56 ], |
| 52 }], | 57 }], |
| 53 ], | 58 ], |
| 54 }, | 59 }, |
| 55 } | 60 } |
| OLD | NEW |