aboutsummaryrefslogtreecommitdiffhomepage
path: root/gyp/zlib.gyp
Commit message (Collapse)AuthorAge
* gyp: supress more warnings for zlibGravatar halcanary2016-05-24
| | | | | | TBR= Review-Url: https://codereview.chromium.org/2008763003
* gyp: clean up warnings with clang-3.8Gravatar halcanary2016-05-23
| | | | | | | | Also: update zlib DEPS. GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2002233002 Review-Url: https://codereview.chromium.org/2002233002
* gyp (third_party) warning changes for ccacheGravatar halcanary2016-05-20
| | | | | | | | Also fix a broken unit test in MatrixTest.cpp. GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2002663002 Review-Url: https://codereview.chromium.org/2002663002
* Put all XSAN bots on the same DEPS-sourced build of Clang.Gravatar mtklein2016-02-12
| | | | | | | | | | | | This adds LLVM, Clang, and compiler-rt (*san tools) to DEPS, then uses them from xsan_build, building them if needed. This is similar to how the CMake bots bootstrap CMake if needed. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1693733003 Review URL: https://codereview.chromium.org/1693733003
* Always build our own zlib.Gravatar mtklein2016-02-03
| | | | | | | | | | | | | | | | | If we want to have an MSAN build, it'll help if we can build our own zlib so that it's instrumented by MSAN. Today we build our own zlib on Windows, but require the system to provide it elsewhere. This just makes everyone build it (except Android framework of course). This drops the SIMD files. They're only used to accelerate deflate (compression), so they're not terribly interesting to us. Again, this only really changes compression speed on Windows bots... pretty niche. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1665843002 Review URL: https://codereview.chromium.org/1665843002
* Fix warnings on VS2015 x86_64 buildGravatar bsalomon2015-08-06
| | | | | | TBR=bungeman@google.com Review URL: https://codereview.chromium.org/1276133002
* Tweak GYP to also link with XCode 7.Gravatar mtklein2015-07-13
| | | | | | | | | | | | | | Using the XCode 7 beta, the file in the GYP doesn't exist, instead we get /Applications/Xcode-beta.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk/usr/lib/libz.tbd which is a text file describing libz and pointing to /usr/lib/libz.1.dylib. There's a weird easy fix, which is that GYP looks for things in libraries like 'libz.dylib' and pattern match translates that to '-lz' on the command line. (Infuriatingly, a literal '-lz' is interpreted as a file path...) BUG=skia: Review URL: https://codereview.chromium.org/1234493002
* Revert of For consistency, use our homebrew zlib everywhere possible. ↵Gravatar mtklein2015-03-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | (patchset #6 id:100001 of https://codereview.chromium.org/971673005/) Reason for revert: Reverting in case this is the cause of the non-Windows failures. Original issue's description: > For consistency, use our homebrew zlib everywhere possible. > > This switches when we build our own zlib from "just Windows" to "everyone, but > not Android framework of course". > > I tested this by building DM for my Mac and for an Android bot config. > It took minor tweaks to the GYP to get ARM builds working. > > BUG=skia: > > Committed: https://skia.googlesource.com/skia/+/5a8f2257b0b0f954fb74f65e7ea3ada772ed9240 TBR=scroggo@google.com,mtklein@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia: Review URL: https://codereview.chromium.org/989873002
* For consistency, use our homebrew zlib everywhere possible.Gravatar mtklein2015-03-06
| | | | | | | | | | | | This switches when we build our own zlib from "just Windows" to "everyone, but not Android framework of course". I tested this by building DM for my Mac and for an Android bot config. It took minor tweaks to the GYP to get ARM builds working. BUG=skia: Review URL: https://codereview.chromium.org/971673005
* On windows, build zlib as a static library.Gravatar scroggo2015-03-02
| | | | | | | | | | | | Partially in preparation for building libpng on Windows. Also, this makes us consistent across platforms for PDF. Uses the version of zlib checked into the Chromium tree. Remove miniz, which is replaced by zlib. Review URL: https://codereview.chromium.org/966963002
* miniz support in SkFlate / PDFGravatar mtklein2015-02-26
| | | | | | | | | | | | | | | | | | | | | | | | | - Adds miniz.c v115_r4 (latest release) to third_party. - Merges SkDeflateWStream into SkFlate so including "miniz.c" links without duplicating symbols. The only interesting code change I've made is to remove the line fImpl->fZStream.data_type = Z_BINARY; from SkDeflateWStream::SkDeflateWStream(). miniz doesn't have Z_BINARY defined, and as far as I can tell, both zlib and miniz ignore data_type. We should be able to swap skflate.gyp's dependency between zlib.gyp:zlib and zlib.gyp:miniz at will (except of course on Windows) if we're interested in zlib itself. I've left android framework on its own zlib. I think this all means we can stop defining SK_NO_FLATE on Windows. I'll leave the possible cleanup of SK_NO_FLATE itself for another time. Might be we always want to keep this dependency optional. CQ_EXTRA_TRYBOTS=client.skia:Test-Win8-ShuttleA-HD7770-x86-Debug-Trybot BUG=skia: Review URL: https://codereview.chromium.org/957323003
* fix xcode buildGravatar mtklein2015-02-18
| | | | | | | | NOTREECHECKS=true BUG=skia: Review URL: https://codereview.chromium.org/936033003
* SK_NO_FLATEGravatar mtklein2015-02-17
| | | | | | | | | | | Also remove skia_zlib_static. We're not using it. We don't even have zlib in DEPS. No public API changes. TBR=reed@google.com BUG=skia: Review URL: https://codereview.chromium.org/936583002
* Fix valgrind bot errors introduced in f84722e4777.Gravatar commit-bot@chromium.org2014-02-25
| | | | | | | | | | | | NOTREECHECKS=true NOTRY=true R=robertphillips@google.com Author: halcanary@google.com Review URL: https://codereview.chromium.org/179843003 git-svn-id: http://skia.googlecode.com/svn/trunk@13580 2bbb7eff-a529-9590-31e7-b0007b416f81
* Build Skia for a bare-bones embedded Linux system.Gravatar commit-bot@chromium.org2014-02-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Motivation: I have downloaded a barebones Linux system built for 64-bit ARM from linaro.org and a ARMv8 Foundation Model from arm.com to run it on. This will let us build and test Skia on ARM64 before we aquire hardware to allow that. This CL introduces the changes to the build files necessary to build Skia on a barebones embedded Linux system. I tested it with the aarch64 GCC compiler provided by linaro.org. Changes: Add a "barelinux" target_os for the DEPS file. Add an optional git download of zlib. Changes to gyp files: these changes abstract out libpng, libz, and giflib so that images.gyp doesn't know whether they are static or dynamically linked. I also add the variables skia_giflib_static, skia_libpng_static, skia_zlib_static, and skia_freetype_static, all of which default to false but when set to true will override the behavior of the giflib, libpng, zlib, and freetype build targets to require them to build statically. Also, the skia_no_fontconfig variable turns off use of the fontconfig service. Scripts in platform_tools/barelinux/bin: arm64_download - this script downloads the Linaro's ARMv8 Aarch64 toolchain and minimal embedded Linux system as well as ARM's foundation model. The required files are mirrored on Google Cloud. The script then starts a emulated Arm64 Linux system in the background. After the boot is complete, you can SSH into the system at port 8022 via user@localhost. The SSH key will be downloaded into the working directery as well. download_deps - Uses gclient to download Skia's dependencies for a bare Linux system (the normal dependecies plus giflib, libpng, and zlib.) barelinux_make - this script builds a version of skia that does not depend on external libraries, perfect for putting in an embedded system running Linux. Assumes you have run download_deps first. To test: To build a barelinux target, use the barelinux_make script. To build for a armv8 system: skia_arch_type=arm arm_neon=0 armv7=1 armv8=1 arm_thumb=0 skia_arch_width=64 and set the CC and CXX variables to point at the cross-compiler downloaded by arm64_download. R=djsollen@google.com, scroggo@google.com, borenet@google.com Author: halcanary@google.com Review URL: https://codereview.chromium.org/152513007 git-svn-id: http://skia.googlecode.com/svn/trunk@13570 2bbb7eff-a529-9590-31e7-b0007b416f81
* Reland "Gyp file changes for the android framework."Gravatar scroggo@google.com2014-02-05
| | | | | | | | | | | | | | Relands https://codereview.chromium.org/153093003/, which was reverted with https://skia.googlesource.com/skia.git/+/eb6295044b97db05ec40625dcebc2459b2a38a98 This reverts commit 6b32be1402eb6c549d5ba1db71860e24f9de2991. BUG=skia:1975 R=djsollen@google.com Review URL: https://codereview.chromium.org/154053002 git-svn-id: http://skia.googlecode.com/svn/trunk@13321 2bbb7eff-a529-9590-31e7-b0007b416f81
* Gyp file changes for the android framework.Gravatar scroggo@google.com2014-02-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Split off from https://codereview.chromium.org/140503007/. The eventual goal is to create our Android.mk from gyp. This patch adds an option for skia_android_framework with the right settings. The follow-up (https://codereview.chromium.org/140503007/) will use scripts to create the final makefile. gyp/android_deps.gyp: Use different dependencies for the framework than for building Skia normally. gyp/android_framework_lib.gyp: Like skia_lib, specifies the minimum needed for building Skia, in this case for the framework. gyp/common_conditions.gypi: Add settings specific to skia_android_framework. In some cases this means turning off flags and defines. gyp/common.gypi Turn off SK_DEBUG and SK_DEVELOPER when building for the framework. This allows the framework to create a single makefile which can be modified to add SK_DEBUG and SK_DEVELOPER as desired. gyp/common_variables.gypi: Add skia_android_framework. gyp/core.gyp: Don't depend on cpufeatures, and add the cutils library for skia_android_framework. gyp/freetype.gyp: skia_android_framework-specific options: Don't include freetype_static as a dependency. Include the proper folders. Include the android library. gyp/images.gyp: Don't export libjpeg as a dependency for targets that include images for the framework. Also reorder image decoders to match the Android order, leaving our most commonly used ones last (and therefore first in the chain for trying them). gyp/libwebp.gyp: Use the system webp when building for the Android framework. Specify the correct settings for the framework. gyp/opts.gyp: Specify a default set of files to compile when there are no possible optimizations. gyp/pdf.gyp: Add dependencies for Android framework. gyp/zlib.gyp: Include the zlib folder, and undefine SK_ZLIB_INCLUDE. BUG=skia:1975 R=djsollen@google.com Committed: https://code.google.com/p/skia/source/detail?r=13298 Review URL: https://codereview.chromium.org/153093003 git-svn-id: http://skia.googlecode.com/svn/trunk@13304 2bbb7eff-a529-9590-31e7-b0007b416f81
* Gyp file changes for the android framework.Gravatar scroggo@google.com2014-02-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Split off from https://codereview.chromium.org/140503007/. The eventual goal is to create our Android.mk from gyp. This patch adds an option for skia_android_framework with the right settings. The follow-up (https://codereview.chromium.org/140503007/) will use scripts to create the final makefile. gyp/android_deps.gyp: Use different dependencies for the framework than for building Skia normally. gyp/android_framework_lib.gyp: Like skia_lib, specifies the minimum needed for building Skia, in this case for the framework. gyp/common_conditions.gypi: Add settings specific to skia_android_framework. In some cases this means turning off flags and defines. gyp/common.gypi Turn off SK_DEBUG and SK_DEVELOPER when building for the framework. This allows the framework to create a single makefile which can be modified to add SK_DEBUG and SK_DEVELOPER as desired. gyp/common_variables.gypi: Add skia_android_framework. gyp/core.gyp: Don't depend on cpufeatures, and add the cutils library for skia_android_framework. gyp/freetype.gyp: skia_android_framework-specific options: Don't include freetype_static as a dependency. Include the proper folders. Include the android library. gyp/images.gyp: Don't export libjpeg as a dependency for targets that include images for the framework. Also reorder image decoders to match the Android order, leaving our most commonly used ones last (and therefore first in the chain for trying them). gyp/libwebp.gyp: Use the system webp when building for the Android framework. Specify the correct settings for the framework. gyp/opts.gyp: Specify a default set of files to compile when there are no possible optimizations. gyp/pdf.gyp: Add dependencies for Android framework. gyp/zlib.gyp: Include the zlib folder, and undefine SK_ZLIB_INCLUDE. BUG=skia:1975 R=djsollen@google.com Review URL: https://codereview.chromium.org/153093003 git-svn-id: http://skia.googlecode.com/svn/trunk@13298 2bbb7eff-a529-9590-31e7-b0007b416f81
* Remove the comments settings for vim tab width and expansion variables.Gravatar commit-bot@chromium.org2013-12-02
| | | | | | | | | | | | | | | | | | These add unnecessary bloat for everyone to carry around, so we just remove them now. The same change was made in chromium by Tony in http://codereview.chromium.org/7310019 - crrev.com/92046 BUG=None TEST=./gyp_skia R=mtklein@google.com Author: tfarina@chromium.org Review URL: https://codereview.chromium.org/92673003 git-svn-id: http://skia.googlecode.com/svn/trunk@12443 2bbb7eff-a529-9590-31e7-b0007b416f81
* Update obvious deps.Gravatar bungeman@google.com2013-07-22
| | | | | | | | | | | | | | | This is a step toward targets declaring their deps in a sane fashion. This change resolves cycles by forcing core to the root, then everything in skia_lib pointing toward core as best possible, then everything outside skia_lib depending on skia_lib for things in skia_lib. This prevents double definitions where a symbol is provided by both the skia_lib shared object and and a statically linked component of skia_lib. R=djsollen@google.com Review URL: https://codereview.chromium.org/19823003 git-svn-id: http://skia.googlecode.com/svn/trunk@10231 2bbb7eff-a529-9590-31e7-b0007b416f81
* Revert deps changes in r10220 and r10217.Gravatar bungeman@google.com2013-07-20
| | | | | | | Need to avoid linking in .a things which are already provided by .so things. git-svn-id: http://skia.googlecode.com/svn/trunk@10222 2bbb7eff-a529-9590-31e7-b0007b416f81
* Update obvious deps.Gravatar bungeman@google.com2013-07-19
| | | | | | | | | | | | | | | This is a step toward targets declaring their deps in a sane fashion. This change resolves cycles by forcing core to the root, then opts, ports, and utils depending on core, then everything else. We will need some other change to resolve the fact that core, opts, ports, and utils depend on each other and other targets which depend on them. Outside of these targets, things look ok. R=djsollen@google.com Review URL: https://codereview.chromium.org/19823003 git-svn-id: http://skia.googlecode.com/svn/trunk@10217 2bbb7eff-a529-9590-31e7-b0007b416f81
* Improve NaCl supportGravatar borenet@google.com2012-11-01
| | | | | | | | | | | | | | | | - Add nacl_make script to build Skia targets for NaCl using gyp - Add nacl_interface for command-line apps - Add nacl_sample as front-end for SampleApp - Add freetype to DEPS - Various gyp tweaks for NaCl TODO: - Implement GL interface - Implement font host - Fix plumbing so that SampleApp works properly Review URL: https://codereview.appspot.com/6671044 git-svn-id: http://skia.googlecode.com/svn/trunk@6245 2bbb7eff-a529-9590-31e7-b0007b416f81
* Allow Xcode to change paths to frameworks based on whether a device or ↵Gravatar bsalomon@google.com2012-10-04
| | | | | | | | | simulator was selected. R=caryclark@google.com Review URL: https://codereview.appspot.com/6590068 git-svn-id: http://skia.googlecode.com/svn/trunk@5802 2bbb7eff-a529-9590-31e7-b0007b416f81
* iOS support work in progressGravatar caryclark@google.com2012-09-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | include/core/SkTypes.h - address unsigned warning include/core/SkInstCnt.h src/core/SkInstCnt.cpp gyp/common.gypi - always define SK_ENABLE_INST_COUNT for debug builds src/views/mac/SkNSView.mm - only call glClear if there is a GL context src/ports/SkImageDecoder_CG.cpp - fix iOS hack by using proper include gyp/opts.gyp - exclude more ARM files from iOS for now (see issue 900) gyp/common_conditions.gypi - add release, more ios specific common settings gyp/bench.gyp - add iOS condition gyp/SampleApp.gyp - remove precompiled header, hardcoded SDK path - add more frameworks gyp/debugger.gyp - fix syntax error - add iOS/Android condition gyp/core.gyp - remove hardcoded SDK path, add more frameworks gyp/common_variables.gypi - add ios SDK path - add ios SDK version gyp/iOSSampleApp.gyp - remove obsolete project gyp/zlib.gyp - add ios library path Review URL: https://codereview.appspot.com/6551070 git-svn-id: http://skia.googlecode.com/svn/trunk@5649 2bbb7eff-a529-9590-31e7-b0007b416f81
* Make all gyp targets automatically include common.gypiGravatar epoger@google.com2012-03-16
| | | | | | | Do this, rather than including common.gypi explicitly in all our gyp files, so that gyp files we use but do not maintain (e.g., third_party/externals/libjpeg/libjpeg.gyp) will include common.gypi too. Review URL: https://codereview.appspot.com/5820068 git-svn-id: http://skia.googlecode.com/svn/trunk@3411 2bbb7eff-a529-9590-31e7-b0007b416f81
* Add support for building Android SampleApp.Gravatar djsollen@google.com2011-11-07
| | | | | | Review URL: http://codereview.appspot.com/5342051 git-svn-id: http://skia.googlecode.com/svn/trunk@2617 2bbb7eff-a529-9590-31e7-b0007b416f81
* Create new 'skia_os' variable to replace use of 'OS' in most places.Gravatar epoger@google.com2011-07-01
| | | | | | | | http://codereview.appspot.com/4627085 git-svn-id: http://skia.googlecode.com/svn/trunk@1782 2bbb7eff-a529-9590-31e7-b0007b416f81
* combine target_defaults.gypi into common.gypiGravatar epoger@google.com2011-07-01
| | | | | | | | http://codereview.appspot.com/4654080 git-svn-id: http://skia.googlecode.com/svn/trunk@1780 2bbb7eff-a529-9590-31e7-b0007b416f81
* Add a zlib target that the pdf target can depend on.Gravatar vandebo@chromium.org2011-06-24
| | | | | | | | - make drawTextOnPath (now used by shadertext) a non fatal NOT_IMPLEMENTED on PDF. Review URL: http://codereview.appspot.com/4631071 git-svn-id: http://skia.googlecode.com/svn/trunk@1722 2bbb7eff-a529-9590-31e7-b0007b416f81
* remove libpng and zlib from third_party Gravatar epoger@google.com2011-06-16
| | | | | | | | http://codereview.appspot.com/4571077 git-svn-id: http://skia.googlecode.com/svn/trunk@1609 2bbb7eff-a529-9590-31e7-b0007b416f81
* fix gm on Mac, and Linux buildbot build, by adding zlib source to third_party Gravatar epoger@google.com2011-06-15
http://codereview.appspot.com/4620047/ I will try to find a better way to keep all this working (remove zlib and libpng from third_party) git-svn-id: http://skia.googlecode.com/svn/trunk@1595 2bbb7eff-a529-9590-31e7-b0007b416f81
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-19 06:06:55 +0000