aboutsummaryrefslogtreecommitdiff
path: root/build_overrides
diff options
context:
space:
mode:
authorkjellander <kjellander@webrtc.org>2016-10-26 13:38:03 -0700
committerCommit bot <commit-bot@chromium.org>2016-10-26 20:38:10 +0000
commitb1125685a089c04565d82ca80128f6b577ed1f51 (patch)
tree85708768c5e1b268665c833c9bfadbdd67408583 /build_overrides
parente183121657fa2daf2985f264cff8dd30cd63b97d (diff)
downloadwebrtc-b1125685a089c04565d82ca80128f6b577ed1f51.tar.gz
Roll chromium_revision 9b5bb47fa0..04e7c673d9 (426837:427632)
Configure ignore_elf32_limitations = true in build_overrides/build.gni as made possible by https://codereview.chromium.org/2448453002/ Changes to webrtc/test/ios/Info.plist were needed due to https://codereview.chromium.org/2441793002 Change log: https://chromium.googlesource.com/chromium/src/+log/9b5bb47fa0..04e7c673d9 Full diff: https://chromium.googlesource.com/chromium/src/+/9b5bb47fa0..04e7c673d9 Changed dependencies: * src/third_party/libFuzzer/src: https://chromium.googlesource.com/chromium/llvm-project/llvm/lib/Fuzzer.git/+log/9aa0bddeb6..0a3128c75d * src/third_party/libvpx/source/libvpx: https://chromium.googlesource.com/webm/libvpx.git/+log/294a734a5f..9a032fa262 * src/third_party/libyuv: https://chromium.googlesource.com/libyuv/libyuv.git/+log/198bce3959..550cf829fb DEPS diff: https://chromium.googlesource.com/chromium/src/+/9b5bb47fa0..04e7c673d9/DEPS Clang version changed 283753:284979 Details: https://chromium.googlesource.com/chromium/src/+/9b5bb47fa0..04e7c673d9/tools/clang/scripts/update.py TBR=marpan@webrtc.org, BUG=webrtc:6596, webrtc:6608 NOTRY=True Review-Url: https://codereview.webrtc.org/2447263003 Cr-Commit-Position: refs/heads/master@{#14794}
Diffstat (limited to 'build_overrides')
-rw-r--r--build_overrides/build.gni5
1 files changed, 5 insertions, 0 deletions
diff --git a/build_overrides/build.gni b/build_overrides/build.gni
index ef40901e59..e5bdf06e73 100644
--- a/build_overrides/build.gni
+++ b/build_overrides/build.gni
@@ -30,3 +30,8 @@ tsan_suppressions_file = "//webrtc/build/sanitizers/tsan_suppressions_webrtc.cc"
# Android lint suppressions file
lint_suppressions_file = "//webrtc/build/android/suppressions.xml"
+
+# For Chromium, Android 32-bit non-component, non-clang builds hit a 4GiB size
+# limit, making them requiring symbol_level=2. WebRTC doesn't hit that problem
+# so we just ignore that assert. See https://crbug.com/648948 for more info.
+ignore_elf32_limitations = true