diff options
| author | Nicolas Pena <npm@chromium.org> | 2017-02-09 14:37:49 -0500 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-02-09 20:36:38 +0000 |
| commit | e818bcba7e036d7e1dc8f282a88022b814dbfb40 (patch) | |
| tree | 5ae04fab0afc3bd79181c67223c0a9898c573db8 /build_overrides | |
| parent | 687a79c5ce07bc338192f19d8452edefaf27dd76 (diff) | |
| download | pdfium-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>
Diffstat (limited to 'build_overrides')
| -rw-r--r-- | build_overrides/build.gni | 9 | ||||
| -rw-r--r-- | build_overrides/v8.gni | 21 |
2 files changed, 5 insertions, 25 deletions
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 |