From 50feafc7f367a87b7e4e689421eb7ae1484660d9 Mon Sep 17 00:00:00 2001 From: thestig Date: Wed, 9 Nov 2016 23:45:50 -0800 Subject: Roll DEPS for clang to 63ca7c81. Also roll DEPS for build/ to 98f2d80a which is required, and update the build_overrides for the new build configs. Also bump the android_ndk_revision version to 26d93ec07. BUG=chromium:663913 TBR=dpranke@chromium.org Review-Url: https://codereview.chromium.org/2488143002 --- build_overrides/build.gni | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'build_overrides') 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 +} -- cgit v1.2.3