Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(313)

Unified Diff: gyp/zlib.gyp

Issue 152513007: Build Skia for a bare-bones embedded Linux system. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: changes Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« gyp/freetype.gyp ('K') | « gyp/skflate.gyp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gyp/zlib.gyp
diff --git a/gyp/zlib.gyp b/gyp/zlib.gyp
deleted file mode 100644
index b26053eaf17dff16c595dfe1a88641f94f9ad91c..0000000000000000000000000000000000000000
--- a/gyp/zlib.gyp
+++ /dev/null
@@ -1,48 +0,0 @@
-# Target for including zlib.
djsollen 2014/02/06 18:22:41 just curious but why not repurpose this file inste
hal.canary 2014/02/06 21:01:54 Done.
-{
- 'targets': [
- {
- 'target_name': 'zlib',
- 'type': 'static_library',
- 'dependencies': [
- 'skia_lib.gyp:skia_lib',
- ],
- 'sources': [
- '../include/core/SkFlate.h',
-
- '../src/core/SkFlate.cpp',
- ],
- 'conditions': [
- [ 'skia_os == "mac"', {
- 'link_settings': {
- 'libraries': [
- '$(SDKROOT)/usr/lib/libz.dylib',
- ],
- },
- 'defines': [ 'SK_ZLIB_INCLUDE=<zlib.h>', ],
- }],
- [ 'skia_os == "ios"', {
- 'link_settings': {
- 'libraries': [
- '$(SDKROOT)/usr/lib/libz.dylib',
- ],
- },
- 'defines': [ 'SK_ZLIB_INCLUDE=<zlib.h>', ],
- }],
- [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "android", "nacl"]', {
- 'link_settings': { 'libraries': [ '-lz', ], },
- 'conditions': [
- [ 'skia_android_framework==0', {
- 'defines': [ 'SK_ZLIB_INCLUDE=<zlib.h>', ],
- }],
- ],
- }],
- [ 'skia_android_framework', {
- 'include_dirs': [
- 'external/zlib',
- ],
- }],
- ],
- },
- ],
-}
« gyp/freetype.gyp ('K') | « gyp/skflate.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698