diff options
Diffstat (limited to 'chromium/third_party/skia/gyp/android_deps.gyp')
-rw-r--r-- | chromium/third_party/skia/gyp/android_deps.gyp | 65 |
1 files changed, 63 insertions, 2 deletions
diff --git a/chromium/third_party/skia/gyp/android_deps.gyp b/chromium/third_party/skia/gyp/android_deps.gyp index cd5b1b0c693..1669b2bdad1 100644 --- a/chromium/third_party/skia/gyp/android_deps.gyp +++ b/chromium/third_party/skia/gyp/android_deps.gyp @@ -14,7 +14,68 @@ # 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': [ + 'external/giflib', + ], + }, + }, + { + 'target_name': 'png', + 'type': 'none', + 'direct_dependent_settings': { + 'libraries' : [ + '-lpng', + ], + 'include_dirs': [ + 'external/libpng', + ], + }, + }, + { + 'target_name': 'jpeg', + 'type': 'none', + 'direct_dependent_settings': { + 'libraries' : [ + '-ljpeg', + ], + 'include_dirs': [ + 'external/jpeg', + ], + }, + }, + { + 'target_name': 'cpu_features', + 'type': 'none', + }, + ], + } + ], ], } |