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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: gyp/zlib.gyp

Issue 140503007: Scripts to generate Android.mk for framework Skia. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Respond to comments in patch set 5. Created 6 years, 11 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/ports.gyp ('K') | « gyp/ports.gyp ('k') | platform_tools/android/bin/android_framework_gyp.py » ('j') | platform_tools/android/bin/android_framework_gyp.py » ('J')
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
index eaa44c5fa285b2d2ccffe5318e0b046e91bd8f96..b26053eaf17dff16c595dfe1a88641f94f9ad91c 100644
--- a/gyp/zlib.gyp
+++ b/gyp/zlib.gyp
@@ -1,3 +1,4 @@
+# Target for including zlib.
{
'targets': [
{
@@ -30,7 +31,16 @@
}],
[ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "android", "nacl"]', {
'link_settings': { 'libraries': [ '-lz', ], },
- 'defines': [ 'SK_ZLIB_INCLUDE=<zlib.h>', ],
+ 'conditions': [
+ [ 'skia_android_framework==0', {
+ 'defines': [ 'SK_ZLIB_INCLUDE=<zlib.h>', ],
+ }],
+ ],
+ }],
+ [ 'skia_android_framework', {
+ 'include_dirs': [
+ 'external/zlib',
+ ],
}],
],
},
« gyp/ports.gyp ('K') | « gyp/ports.gyp ('k') | platform_tools/android/bin/android_framework_gyp.py » ('j') | platform_tools/android/bin/android_framework_gyp.py » ('J')

Powered by Google App Engine
This is Rietveld 408576698