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

Unified Diff: gyp/libwebp.gyp

Issue 140503007: Scripts to generate Android.mk for framework Skia. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Update copyrights, remove unnecessary code. 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
Index: gyp/libwebp.gyp
diff --git a/gyp/libwebp.gyp b/gyp/libwebp.gyp
index 1f8689ada3dfc84747b0b128e60d75f66acb6a1e..b4fdbb6a320d8d8ac202f584a4a9e5acc503c2c2 100644
--- a/gyp/libwebp.gyp
+++ b/gyp/libwebp.gyp
@@ -4,7 +4,13 @@
{
'variables': {
- 'use_system_libwebp%': 0,
+ 'conditions':[
+ ['skia_android_framework == 1', {
+ 'use_system_libwebp': 1,
+ }, {
+ 'use_system_libwebp%': 0,
+ }],
+ ],
},
'conditions': [
['use_system_libwebp==0', {
@@ -156,20 +162,36 @@
},
],
}, {
+ # use_system_libwep == 1
'targets': [
{
'target_name': 'libwebp',
'type': 'none',
- 'direct_dependent_settings': {
- 'defines': [
- 'ENABLE_WEBP',
- ],
- },
- 'link_settings': {
- 'libraries': [
- '-lwebp',
+ 'conditions': [
+ [ 'skia_android_framework', {
+ 'direct_dependent_settings': {
+ 'libraries': [
+ 'libwebp-decode.a',
+ 'libwebp-encode.a',
+ ],
+ 'include_dirs': [
+ '$(TOPDIR)external/webp/include',
+ ],
+ },
+ }, { # skia_android_framework == 0
+ 'direct_dependent_settings': {
+ 'defines': [
+ 'ENABLE_WEBP',
+ ],
+ },
+ 'link_settings': {
+ 'libraries': [
+ '-lwebp',
+ ],
+ },
+ },
],
- },
+ ],
}
],
}],

Powered by Google App Engine
This is Rietveld 408576698