summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorLei Zhang <thestig@chromium.org>2017-04-06 21:43:50 -0700
committerChromium commit bot <commit-bot@chromium.org>2017-04-07 04:54:45 +0000
commit0e5d892fe86d7c2527d8f7b7ac2c5aa8fc77a7be (patch)
treed47e7f2c57e4c2231efb6ed197d695c3537859dd /.gitignore
parent4bb4029b1523aa1dbd328fee6ac66385c5fa5b48 (diff)
downloadpdfium-0e5d892fe86d7c2527d8f7b7ac2c5aa8fc77a7be.tar.xz
Use libjpeg-turbo instead of our own copy of libjpeg.
Check out libjpeg-turbo via DEPS. Also checkout yasm via DEPS and copy some yasm build files from Chromium. BUG=chromium:541704,pdfium:389 Change-Id: Ic7af415f002a3ca2acd9223ed3474dedf3930b32 Reviewed-on: https://pdfium-review.googlesource.com/3470 Commit-Queue: Lei Zhang <thestig@chromium.org> Reviewed-by: dsinclair <dsinclair@chromium.org>
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore5
1 files changed, 3 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index c80bf34dc8..289162c429 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,9 +10,12 @@
/third_party/freetype/src
/third_party/icu
/third_party/instrumented_libraries
+/third_party/libjpeg_turbo
/third_party/llvm
/third_party/llvm-build
/third_party/skia
+/third_party/yasm/binaries
+/third_party/yasm/source/patched-yasm
/third_party/zlib
/tools/clang
/tools/generate_library_loader
@@ -20,13 +23,11 @@
/tools/memory
/v8
/xcodebuild
-Makefile
.DS_Store
.gclient
.gclient_entries
*.aps
*.filters
-*.mk
*.opensdf
*.pyc
*.sdf