From 7f3a15f714c8311b1adb7bdce1ac83c7113af598 Mon Sep 17 00:00:00 2001 From: jbudorick Date: Fri, 10 Jun 2016 06:28:40 -0700 Subject: [Android] Add support for standalone PDFium gn build on Android. This pulls in the android NDK and catapult, rolls chromium/src/build/, and pulls in two .gni updates. It also fixes a few miscellaneous compile failures in android-specific code. BUG=pdfium:38 Review-Url: https://codereview.chromium.org/2059553002 --- build_overrides/build.gni | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) (limited to 'build_overrides') diff --git a/build_overrides/build.gni b/build_overrides/build.gni index 9d68f10933..1c0b53fe19 100644 --- a/build_overrides/build.gni +++ b/build_overrides/build.gni @@ -3,6 +3,20 @@ # found in the LICENSE file. # See https://bugs.chromium.org/p/webrtc/issues/detail?id=5453. -# These overrides are needed and should generally track Chromium settings. -mac_deployment_target_build_override = "10.7" +# Some WebRTC targets require the 10.7 deployment version of the Mac SDK +# and a 10.11 min SDK, but those targets are only used in non-Chromium +# builds. We can remove this when Chromium drops 10.6 support and also +# requires 10.7. mac_sdk_min_build_override = "10.10" +mac_deployment_target_build_override = "10.7" + +# Variable that can be used to support multiple build scenarios, like having +# Chromium specific targets in a client project's GN file etc. +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" + +# Some non-Chromium builds don't support building java targets. +enable_java_templates = false -- cgit v1.2.3