summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--BUILD.gn4
-rw-r--r--DEPS10
2 files changed, 9 insertions, 5 deletions
diff --git a/BUILD.gn b/BUILD.gn
index 5bba3fe352..d23d8bd81a 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -2981,6 +2981,10 @@ test("pdfium_unittests") {
if (is_android) {
use_raw_android_executable = true
}
+ if (is_clang) {
+ # Suppress no override warning for overridden functions.
+ cflags = [ "-Wno-inconsistent-missing-override" ]
+ }
}
test("pdfium_embeddertests") {
diff --git a/DEPS b/DEPS
index 1891f00fe8..a6351f07db 100644
--- a/DEPS
+++ b/DEPS
@@ -13,12 +13,12 @@ vars = {
'chromium_git': 'https://chromium.googlesource.com',
'pdfium_git': 'https://pdfium.googlesource.com',
- 'android_ndk_revision': 'e951c37287c7d8cd915bf8d4149fd4a06d808b55',
+ 'android_ndk_revision': '5cd86312e794bdf542a3685c6f10cbb96072990b',
'binutils_revision': 'e146228c20af6af922887d0be2d3641cbffb33c5',
- 'build_revision': '037f38ae0fe5e11b4f7c33b750fd7a1e9634a606',
- 'buildtools_revision': 'ab7b6a7b350dd15804c87c20ce78982811fdd76f',
- 'catapult_revision': '4f03e51f019492441438893094f789df20102a93',
- 'clang_revision': 'abe5e4f9dc0f1df848c7a0efa05256253e77a7b7',
+ 'build_revision': '10a93c2ce7360864b59aecfed4c6b8608cd2f0cc',
+ 'buildtools_revision': '893eb86b02b2571894e328f05551112b96df1cce',
+ 'catapult_revision': '8fbdf9f10b76595b6299e577709f2608ae29e19a',
+ 'clang_revision': 'c893c7eec4706f8c7fc244ee254b1dadd8f8d158',
'cygwin_revision': 'c89e446b273697fadf3a10ff1007a97c0b7de6df',
'depot_tools_revision': '869a2857a4f3acc08fdec6182ecec5b73593be3b',
'freetype_revision': '9e345c911714ed62250be13d03d72e25d91fbc77',