diff options
author | Ben Murdoch <benm@google.com> | 2013-08-07 11:05:26 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2013-08-07 11:05:26 +0100 |
commit | d383201bb8dd404105c3f8dd06ee28503fe0c39b (patch) | |
tree | 1809b3db5a4facfc0a8241f3946af1975c9f5edf | |
parent | 802f6c0bb5d03839206bafb629f4475a06c15dc8 (diff) | |
parent | 1144aa15a4859b1957ca171a436d1fbb6f22b74d (diff) | |
download | gyp-d383201bb8dd404105c3f8dd06ee28503fe0c39b.tar.gz |
Merge from Chromium at DEPS revision r216133
This commit was generated by merge_to_master.py.
Change-Id: I96bb9d31020fd7aa85ea0dbb6b95dd7c68b91dae
-rw-r--r-- | core.gyp | 6 | ||||
-rw-r--r-- | pdf.gyp | 37 | ||||
-rw-r--r-- | pdf.gypi | 50 | ||||
-rw-r--r-- | pdfviewer.gyp | 16 | ||||
-rw-r--r-- | tests.gyp | 2 |
5 files changed, 76 insertions, 35 deletions
@@ -79,11 +79,13 @@ 'sources': [ '../src/core/SkPaintOptionsAndroid.cpp', ], + 'dependencies': [ + 'android_deps.gyp:cpu_features', + ], }], - [ 'skia_os == "android" and skia_arch_type == "arm"', { + [ 'skia_arch_type == "arm"', { # The code in SkUtilsArm.cpp can be used on an ARM-based Linux system, not only Android. 'sources': [ - '../src/core/SkPaintOptionsAndroid.cpp', '../src/core/SkUtilsArm.cpp', '../src/core/SkUtilsArm.h', ], @@ -9,45 +9,16 @@ 'skia_lib.gyp:skia_lib', 'zlib.gyp:zlib', ], + 'includes': [ + 'pdf.gypi', + ], 'include_dirs': [ '../include/pdf', '../src/core', # needed to get SkGlyphCache.h and SkTextFormatParams.h '../src/utils', # needed to get SkBitSet.h ], 'sources': [ - '../include/pdf/SkPDFDevice.h', - '../include/pdf/SkPDFDocument.h', - - '../src/pdf/SkPDFCatalog.cpp', - '../src/pdf/SkPDFCatalog.h', - '../src/pdf/SkPDFDevice.cpp', - '../src/pdf/SkPDFDocument.cpp', - '../src/pdf/SkPDFFont.cpp', - '../src/pdf/SkPDFFont.h', - '../src/pdf/SkPDFFontImpl.h', - '../src/pdf/SkPDFFormXObject.cpp', - '../src/pdf/SkPDFFormXObject.h', - '../src/pdf/SkPDFGraphicState.cpp', - '../src/pdf/SkPDFGraphicState.h', - '../src/pdf/SkPDFImage.cpp', - '../src/pdf/SkPDFImage.h', - '../src/pdf/SkPDFImageStream.cpp', - '../src/pdf/SkPDFImageStream.h', - '../src/pdf/SkPDFPage.cpp', - '../src/pdf/SkPDFPage.h', - '../src/pdf/SkPDFResourceDict.cpp', - '../src/pdf/SkPDFResourceDict.h', - '../src/pdf/SkPDFShader.cpp', - '../src/pdf/SkPDFShader.h', - '../src/pdf/SkPDFStream.cpp', - '../src/pdf/SkPDFStream.h', - '../src/pdf/SkPDFTypes.cpp', - '../src/pdf/SkPDFTypes.h', - '../src/pdf/SkPDFUtils.cpp', - '../src/pdf/SkPDFUtils.h', - '../src/pdf/SkTSet.h', - - '../src/doc/SkDocument_PDF.cpp', + 'pdf.gypi', # Makes the gypi appear in IDEs (but does not modify the build). ], # This section makes all targets that depend on this target # #define SK_SUPPORT_PDF and have access to the pdf header files. diff --git a/pdf.gypi b/pdf.gypi new file mode 100644 index 0000000..ae4a032 --- /dev/null +++ b/pdf.gypi @@ -0,0 +1,50 @@ +# Include this gypi to include all 'pdf' files +# The parent gyp/gypi file must define +# 'skia_src_path' e.g. skia/trunk/src +# 'skia_include_path' e.g. skia/trunk/include +# +# The skia build defines these in common_variables.gypi +# +{ + 'sources': [ + '<(skia_include_path)/pdf/SkPDFDevice.h', + '<(skia_include_path)/pdf/SkPDFDocument.h', + + '<(skia_src_path)/pdf/SkPDFCatalog.cpp', + '<(skia_src_path)/pdf/SkPDFCatalog.h', + '<(skia_src_path)/pdf/SkPDFDevice.cpp', + '<(skia_src_path)/pdf/SkPDFDocument.cpp', + '<(skia_src_path)/pdf/SkPDFFont.cpp', + '<(skia_src_path)/pdf/SkPDFFont.h', + '<(skia_src_path)/pdf/SkPDFFontImpl.h', + '<(skia_src_path)/pdf/SkPDFFormXObject.cpp', + '<(skia_src_path)/pdf/SkPDFFormXObject.h', + '<(skia_src_path)/pdf/SkPDFGraphicState.cpp', + '<(skia_src_path)/pdf/SkPDFGraphicState.h', + '<(skia_src_path)/pdf/SkPDFImage.cpp', + '<(skia_src_path)/pdf/SkPDFImage.h', + '<(skia_src_path)/pdf/SkPDFImageStream.cpp', + '<(skia_src_path)/pdf/SkPDFImageStream.h', + '<(skia_src_path)/pdf/SkPDFPage.cpp', + '<(skia_src_path)/pdf/SkPDFPage.h', + '<(skia_src_path)/pdf/SkPDFResourceDict.cpp', + '<(skia_src_path)/pdf/SkPDFResourceDict.h', + '<(skia_src_path)/pdf/SkPDFShader.cpp', + '<(skia_src_path)/pdf/SkPDFShader.h', + '<(skia_src_path)/pdf/SkPDFStream.cpp', + '<(skia_src_path)/pdf/SkPDFStream.h', + '<(skia_src_path)/pdf/SkPDFTypes.cpp', + '<(skia_src_path)/pdf/SkPDFTypes.h', + '<(skia_src_path)/pdf/SkPDFUtils.cpp', + '<(skia_src_path)/pdf/SkPDFUtils.h', + '<(skia_src_path)/pdf/SkTSet.h', + + '<(skia_src_path)/doc/SkDocument_PDF.cpp', + ], +} + +# Local Variables: +# tab-width:2 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=2 shiftwidth=2: diff --git a/pdfviewer.gyp b/pdfviewer.gyp index 8552f3b..063c294 100644 --- a/pdfviewer.gyp +++ b/pdfviewer.gyp @@ -99,6 +99,22 @@ 'core.gyp:core', 'flags.gyp:flags', 'libpdfviewer', + 'chop_transparency', + ], + }, + { + 'target_name': 'chop_transparency', + 'type': 'executable', + 'sources': [ + '../experimental/PdfViewer/chop_transparency_main.cpp', + ], + 'include_dirs': [ + # For SkBitmapHasher.h + '../src/utils/', + ], + 'dependencies': [ + 'skia_lib.gyp:skia_lib', + 'flags.gyp:flags', ], }, ], @@ -48,6 +48,7 @@ '../tests/DrawBitmapRectTest.cpp', '../tests/DrawPathTest.cpp', '../tests/DrawTextTest.cpp', + '../tests/DynamicHashTest.cpp', '../tests/EmptyPathTest.cpp', '../tests/ErrorTest.cpp', '../tests/FillPathTest.cpp', @@ -62,6 +63,7 @@ '../tests/GLInterfaceValidation.cpp', '../tests/GLProgramsTest.cpp', '../tests/GpuBitmapCopyTest.cpp', + '../tests/GpuDrawPathTest.cpp', '../tests/GrContextFactoryTest.cpp', '../tests/GradientTest.cpp', '../tests/GrMemoryPoolTest.cpp', |