summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Pena <npm@chromium.org>2017-02-09 14:37:49 -0500
committerChromium commit bot <commit-bot@chromium.org>2017-02-09 20:36:38 +0000
commite818bcba7e036d7e1dc8f282a88022b814dbfb40 (patch)
tree5ae04fab0afc3bd79181c67223c0a9898c573db8
parent687a79c5ce07bc338192f19d8452edefaf27dd76 (diff)
downloadpdfium-e818bcba7e036d7e1dc8f282a88022b814dbfb40.tar.xz
Roll build, buildtools, and V8chromium/3008
Unlanded attempt: https://pdfium-review.googlesource.com/c/2410/ BUG=690088 Change-Id: I0bd3396426bd9faadb8c8dba2c2b7a7b9b52b178 Reviewed-on: https://pdfium-review.googlesource.com/2576 Reviewed-by: dsinclair <dsinclair@chromium.org> Commit-Queue: Nicolás Peña <npm@chromium.org>
-rw-r--r--.gn9
-rw-r--r--DEPS6
-rw-r--r--build_overrides/build.gni9
-rw-r--r--build_overrides/v8.gni21
4 files changed, 17 insertions, 28 deletions
diff --git a/.gn b/.gn
index fbcbf4bb4f..ce52529254 100644
--- a/.gn
+++ b/.gn
@@ -4,3 +4,12 @@
buildconfig = "//build/config/BUILDCONFIG.gn"
secondary_source = "//build/secondary/"
+
+default_args = {
+ v8_extra_library_files = []
+ v8_experimental_extra_library_files = []
+ v8_enable_inspector = false
+
+ # Turns on compiler optimizations in V8 in Debug build.
+ v8_optimized_debug = true
+}
diff --git a/DEPS b/DEPS
index 2057e4edaa..061ea7cb69 100644
--- a/DEPS
+++ b/DEPS
@@ -5,8 +5,8 @@ vars = {
'pdfium_git': 'https://pdfium.googlesource.com',
'android_ndk_revision': '26d93ec07f3ce2ec2cdfeae1b21ee6f12ff868d8',
- 'build_revision': 'acf607f7d345915ea2ecca208bc516677d298463',
- 'buildtools_revision': '5fd66957f08bb752dca714a591c84587c9d70762',
+ 'build_revision': 'dd795a26b9e43ff3a0d761bfd509c2fa67a3a7a1',
+ 'buildtools_revision': 'cf493f8b1ae59611b19b000d7af922559b6ae92a',
'catapult_revision': '86352b966b0245d6883e5f7df27687856978b6d7',
'clang_revision': '0a306690ccb471f75990b488b8b61cabbcca3011',
'cygwin_revision': 'c89e446b273697fadf3a10ff1007a97c0b7de6df',
@@ -19,7 +19,7 @@ vars = {
'skia_revision': '90e3cd78991ef337dbd0023efb30ece864694308',
'tools_memory_revision': '427f10475e1a8d72424c29d00bf689122b738e5d',
'trace_event_revision': '06294c8a4a6f744ef284cd63cfe54dbf61eea290',
- 'v8_revision': '8e0dcfc4ac75c0bef9063bd5dec4dafaa3409b6d',
+ 'v8_revision': '7a634798302b4ab1f1525a9a881629519c0c2a99',
}
deps = {
diff --git a/build_overrides/build.gni b/build_overrides/build.gni
index 61d7814005..af65788b83 100644
--- a/build_overrides/build.gni
+++ b/build_overrides/build.gni
@@ -12,12 +12,12 @@ 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
+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_major_version = 12
# PDFium builds don't support building java targets.
enable_java_templates = false
@@ -51,8 +51,9 @@ declare_args() {
if (use_system_xcode == "") {
if (target_os == "mac") {
- _result =
- exec_script("//build/mac/should_use_hermetic_xcode.py", [], "value")
+ _result = exec_script("//build/mac/should_use_hermetic_xcode.py",
+ [ target_os ],
+ "value")
use_system_xcode = _result == 0
}
if (target_os == "ios") {
diff --git a/build_overrides/v8.gni b/build_overrides/v8.gni
deleted file mode 100644
index d9c21d4856..0000000000
--- a/build_overrides/v8.gni
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 2015 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-if (is_android) {
- import("//build/config/android/config.gni")
-}
-
-v8_use_external_startup_data = !is_ios
-
-# Turns on compiler optimizations in V8 in Debug build.
-v8_optimized_debug = true
-
-# V8 extras
-# Adding V8 extras files requires API owners review
-# Be sure to synchronize with build/common.gypi
-
-v8_extra_library_files = []
-v8_experimental_extra_library_files = []
-
-v8_enable_inspector_override = false