Chromium Code Reviews| Index: gyp/android_deps.gyp |
| diff --git a/gyp/android_deps.gyp b/gyp/android_deps.gyp |
| index cd5b1b0c693c483850957c936265cfbec5aaafc7..74063158d738b8e45419513f9b1e1842f85bbc8e 100644 |
| --- a/gyp/android_deps.gyp |
| +++ b/gyp/android_deps.gyp |
| @@ -14,7 +14,64 @@ |
| # This is due to the fact that we cannot use variables in an includes as the |
| # variable expansion step for gyp happens after the includes are processed. |
| { |
| - 'includes': [ |
| - '../platform_tools/android/gyp/dependencies.gypi', |
| + 'conditions': [ |
| + [ 'skia_android_framework == 0', |
| + { |
| + 'includes': [ |
| + '../platform_tools/android/gyp/dependencies.gypi', |
| + ], |
| + }, { # else skia_android_framework |
| + 'cflags': [ |
| + '-Wno-error' |
| + ], |
| + 'targets': [ |
| + { |
| + 'target_name': 'expat', |
| + 'type': 'none', |
| + 'direct_dependent_settings': { |
| + 'libraries' : [ |
| + '-lexpat', |
| + ], |
| + }, |
| + }, |
| + { |
| + 'target_name': 'gif', |
| + 'type': 'none', |
| + 'direct_dependent_settings': { |
| + 'libraries' : [ |
| + 'libgif.a', |
| + ], |
| + 'include_dirs': [ |
| + '$(TOPDIR)external/giflib', |
|
djsollen
2014/01/21 17:47:37
do you need topdir here?
scroggo
2014/01/21 19:10:06
This was required when I was attempting to use the
|
| + ], |
| + }, |
| + }, |
| + { |
| + 'target_name': 'png', |
| + 'type': 'none', |
| + 'direct_dependent_settings': { |
| + 'libraries' : [ |
| + '-lpng', |
| + ], |
| + 'include_dirs': [ |
| + '$(TOPDIR)external/libpng', |
| + ], |
| + }, |
| + }, |
| + { |
| + 'target_name': 'jpeg', |
| + 'type': 'none', |
| + 'direct_dependent_settings': { |
| + 'libraries' : [ |
| + '-ljpeg', |
| + ], |
| + 'include_dirs': [ |
| + '$(TOPDIR)external/jpeg', |
| + ], |
| + }, |
| + }, |
| + ], |
| + } |
| + ], |
| ], |
| } |