summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Anderson <thomasanderson@chromium.org>2017-07-18 18:00:18 -0700
committerChromium commit bot <commit-bot@chromium.org>2017-07-19 01:16:20 +0000
commit19817af6f201b29c784f5deb76dce403352044aa (patch)
tree027816aa6de6acad3217203fb8aaf7b7eb3dccf7
parentaeadad1dfb7e4d3582d63dacd2ecbed71a5dd4ec (diff)
downloadpdfium-19817af6f201b29c784f5deb76dce403352044aa.tar.xz
Pull in sysroots on Linux
R=thestig@chromium.org Change-Id: I8af51bec8ddfdee8c61806b844f0ca9a2b8c8c20 Reviewed-on: https://pdfium-review.googlesource.com/8190 Commit-Queue: Lei Zhang <thestig@chromium.org> Reviewed-by: Lei Zhang <thestig@chromium.org>
-rw-r--r--DEPS19
-rw-r--r--README.md1
2 files changed, 14 insertions, 6 deletions
diff --git a/DEPS b/DEPS
index 1cd7dcc036..0ad0f78588 100644
--- a/DEPS
+++ b/DEPS
@@ -92,6 +92,11 @@ deps = {
Var('chromium_git') + "/chromium/src/tools/generate_library_loader@" +
Var('gen_library_loader_revision'),
+ # TODO(GYP): Remove this when no tools rely on GYP anymore.
+ "tools/gyp":
+ Var('chromium_git') + '/external/gyp.git@' +
+ 'eb296f67da078ec01f5e3a9ea9cdc6d26d680161',
+
"tools/memory":
Var('chromium_git') + "/chromium/src/tools/memory@" +
Var('tools_memory_revision'),
@@ -114,11 +119,6 @@ deps_os = {
Var('chromium_git') + '/chromium/deps/yasm/binaries.git' + '@' +
Var('yasm_binary_revision'),
- # TODO(GYP): Remove this when no tools rely on GYP anymore.
- "tools/gyp":
- Var('chromium_git') + '/external/gyp.git@' +
- 'c61b0b35c8396bfd59efc6cfc11401d912b0f510',
-
"v8/third_party/cygwin":
Var('chromium_git') + "/chromium/deps/cygwin@" + Var('cygwin_revision'),
},
@@ -219,6 +219,15 @@ hooks = [
],
},
{
+ # Downloads the current stable linux sysroot to build/linux/ if needed.
+ # This sysroot updates at about the same rate that the chrome build deps
+ # change.
+ 'name': 'sysroot',
+ 'pattern': '.',
+ 'action': ['python', 'pdfium/build/linux/sysroot_scripts/install-sysroot.py',
+ '--running-as-hook'],
+ },
+ {
# Update the Windows toolchain if necessary.
'name': 'win_toolchain',
'pattern': '.',
diff --git a/README.md b/README.md
index 22aeacd340..ca443950a9 100644
--- a/README.md
+++ b/README.md
@@ -94,7 +94,6 @@ pdf_is_standalone = true # Set for a non-embedded build.
is_component_build = false # Disable component build (must be false)
clang_use_chrome_plugins = false # Currently must be false.
-use_sysroot = false # Currently must be false on Linux, but entirely omitted on windows.
```
Note, you must set `pdf_is_standalone = true` if you want the sample