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}
diff --git a/DEPS b/DEPS
index 137eb1a..a8c66d9 100644
--- a/DEPS
+++ b/DEPS
@@ -6,7 +6,7 @@
vars = {
'extra_gyp_flag': '-Dextra_gyp_flag=0',
'chromium_git': 'https://chromium.googlesource.com',
- 'chromium_revision': '9b5bb47fa0a7e219fdaf093a83ba2a1f63f63b7e',
+ 'chromium_revision': '04e7c673d985877c240d0c2791c33e9aeeace7f8',
}
# NOTE: Use http rather than https; the latter can cause problems for users
diff --git a/build_overrides/build.gni b/build_overrides/build.gni
index ef40901..e5bdf06 100644
--- a/build_overrides/build.gni
+++ b/build_overrides/build.gni
@@ -30,3 +30,8 @@
# 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
diff --git a/setup_links.py b/setup_links.py
index 7ab086e..30b7a9a 100755
--- a/setup_links.py
+++ b/setup_links.py
@@ -90,6 +90,7 @@
'base',
'third_party/accessibility_test_framework',
'third_party/android_platform',
+ 'third_party/android_support_test_runner',
'third_party/android_tools',
'third_party/apache_velocity',
'third_party/appurify-python',
diff --git a/webrtc/test/ios/Info.plist b/webrtc/test/ios/Info.plist
index 3adbe7c..4f6ae58 100644
--- a/webrtc/test/ios/Info.plist
+++ b/webrtc/test/ios/Info.plist
@@ -9,7 +9,7 @@
<key>CFBundleExecutable</key>
<string>${EXECUTABLE_NAME}</string>
<key>CFBundleIdentifier</key>
- <string>com.google.gtest.${BUNDLE_ID_TEST_NAME:rfc1034identifier}</string>
+ <string>${IOS_BUNDLE_ID_PREFIX}.gtest.${GTEST_BUNDLE_ID_SUFFIX:rfc1034identifier}</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
