Index: build_overrides/build.gni |
diff --git a/build_overrides/build.gni b/build_overrides/build.gni |
index ccc838f31309dde90fd3995fea8c9d86d4a40fa0..a9e8000a859329c0c1bb088e214342cca91c599f 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 |
+} |