diff options
| -rw-r--r-- | DEPS | 6 | ||||
| -rw-r--r-- | build_overrides/build.gni | 11 |
2 files changed, 12 insertions, 5 deletions
@@ -4,11 +4,11 @@ vars = { 'chromium_git': 'https://chromium.googlesource.com', 'pdfium_git': 'https://pdfium.googlesource.com', - 'android_ndk_revision': '5022f40f12953c02b2614c5f7beb981ec5d0e833', - 'build_revision': 'b73bafdd0ff0efc8835de6e646b47eec0a2a38a4', + 'android_ndk_revision': '26d93ec07f3ce2ec2cdfeae1b21ee6f12ff868d8', + 'build_revision': '98f2d80a58aa2ba234f1d37e6844aea81554a903', 'buildtools_revision': '5fd66957f08bb752dca714a591c84587c9d70762', 'catapult_revision': '327256cb1c387e62a2c7e6960e2398867665fb51', - 'clang_revision': '797371be0a75c9892d6acb486d0430915ea538a6', + 'clang_revision': '63ca7c8159abd3f5375ffaba72b04eb91feca3bb', 'cygwin_revision': 'c89e446b273697fadf3a10ff1007a97c0b7de6df', 'gen_library_loader_revision': '916d4acd8b2cde67a390737dfba90b3c37de23a1', 'gmock_revision': '29763965ab52f24565299976b936d1265cb6a271', diff --git a/build_overrides/build.gni b/build_overrides/build.gni index ccc838f313..a9e8000a85 100644 --- a/build_overrides/build.gni +++ b/build_overrides/build.gni @@ -16,8 +16,8 @@ build_with_chromium = true # Support different NDK locations in non-Chromium builds. default_android_ndk_root = "//third_party/android_ndk" -default_android_ndk_version = "r11c" -default_android_ndk_major_version = "11" +default_android_ndk_version = "r12b" +default_android_ndk_major_version = "12" # PDFium builds don't support building java targets. enable_java_templates = false @@ -34,3 +34,10 @@ linux_use_bundled_binutils_override = false asan_suppressions_file = "//build/sanitizers/asan_suppressions.cc" lsan_suppressions_file = "//build/sanitizers/lsan_suppressions.cc" tsan_suppressions_file = "//build/sanitizers/tsan_suppressions.cc" + +declare_args() { + # Android 32-bit non-component, non-clang builds cannot have symbol_level=2 + # due to 4GiB file size limit, see https://crbug.com/648948. + # Set this flag to true to skip the assertion. + ignore_elf32_limitations = false +} |