summaryrefslogtreecommitdiff
path: root/build_overrides/build.gni
diff options
context:
space:
mode:
authorHenrique Nakashima <hnakashima@chromium.org>2018-01-31 21:38:34 +0000
committerChromium commit bot <commit-bot@chromium.org>2018-01-31 21:38:34 +0000
commitbb04c59ec30b00cae6c902fa8bc128220bcff4df (patch)
treeef2ea3412ea628a553ecd29efec63d8e43d34fd9 /build_overrides/build.gni
parent16f792a7ff8f42595624e34be132355515c0ee46 (diff)
downloadpdfium-bb04c59ec30b00cae6c902fa8bc128220bcff4df.tar.xz
Roll android_ndk, build, buildtools.
Roll DEPS for android_ndk to e951c37287c7d8cd915bf8d4149fd4a06d808b55. https://chromium.googlesource.com/android_ndk/+log/d5752321..e951c372 Roll DEPS for build to b1bf4b84cb5db309fda657ebd19a6c3d2ebdcb66. https://chromium.googlesource.com/chromium/src/build/+log/097c79ba..b1bf4b84 Roll DEPS for buildtools to f115f4786771afdfacb18a2299541b23e21f4792. https://chromium.googlesource.com/chromium/buildtools/+log/b36c7b60..f115f478 The android_ndk version needs to be updated to r16. android_ndk and build cannot be rolled separately. build depends on the buildtools changes. This enables pdfium to be built with emscripten. Bug: chromium:804907 Change-Id: If442e92f2f608ae20b476b9b077111e2596187cf Reviewed-on: https://pdfium-review.googlesource.com/24890 Reviewed-by: Lei Zhang <thestig@chromium.org> Commit-Queue: Henrique Nakashima <hnakashima@chromium.org>
Diffstat (limited to 'build_overrides/build.gni')
-rw-r--r--build_overrides/build.gni4
1 files changed, 2 insertions, 2 deletions
diff --git a/build_overrides/build.gni b/build_overrides/build.gni
index af65788b83..bb1525380e 100644
--- a/build_overrides/build.gni
+++ b/build_overrides/build.gni
@@ -16,8 +16,8 @@ build_with_chromium = false
# Support different NDK locations in non-Chromium builds.
default_android_ndk_root = "//third_party/android_ndk"
-default_android_ndk_version = "r12b"
-default_android_ndk_major_version = 12
+default_android_ndk_version = "r16"
+default_android_ndk_major_version = 16
# PDFium builds don't support building java targets.
enable_java_templates = false