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

Side by Side Diff: gyp/libpng.gyp

Issue 1406153015: Remove dependencies on Android's forked decoder libraries (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: It is 2015 Created 5 years, 1 month 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 unified diff | Download patch
« no previous file with comments | « gyp/libjpeg-turbo-selector.gyp ('k') | platform_tools/android/gyp/dependencies.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2014 Google Inc. 1 # Copyright 2014 Google Inc.
2 # 2 #
3 # Use of this source code is governed by a BSD-style license that can be 3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file. 4 # found in the LICENSE file.
5 5
6 { 6 {
7 'variables': { 7 'variables': {
8 'skia_warnings_as_errors': 0, 8 'skia_warnings_as_errors': 0,
9 }, 9 },
10 'targets': [ 10 'targets': [
11 { 11 {
12 'target_name': 'libpng', 12 'target_name': 'libpng',
13 'type': 'none', 13 'type': 'none',
14 'conditions': [ 14 'conditions': [
15 [ 'skia_os == "android"', {
16 'dependencies': [ 'android_deps.gyp:png' ],
17 'export_dependent_settings': [ 'android_deps.gyp:png' ],
18 },{
19 'dependencies': [ 'libpng.gyp:libpng_static' ],
20 'export_dependent_settings': [ 'libpng.gyp:libpng_static' ],
21 }]
22 ]
23 },
24 {
25 'target_name': 'libpng_static_when_possible',
26 'type': 'none',
27 'conditions': [
28 [ 'skia_android_framework', { 15 [ 'skia_android_framework', {
29 'dependencies': [ 'android_deps.gyp:png' ], 16 'dependencies': [ 'android_deps.gyp:png' ],
30 'export_dependent_settings': [ 'android_deps.gyp:png' ], 17 'export_dependent_settings': [ 'android_deps.gyp:png' ],
31 },{ 18 },{
32 'dependencies': [ 'libpng.gyp:libpng_static' ], 19 'dependencies': [ 'libpng.gyp:libpng_static' ],
33 'export_dependent_settings': [ 'libpng.gyp:libpng_static' ], 20 'export_dependent_settings': [ 'libpng.gyp:libpng_static' ],
34 }] 21 }]
35 ] 22 ]
36 }, 23 },
37 { 24 {
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 'conditions': [ 99 'conditions': [
113 ['arm_neon_optional', { 100 ['arm_neon_optional', {
114 'cflags': [ 101 'cflags': [
115 '-mfpu=neon', 102 '-mfpu=neon',
116 ], 103 ],
117 }], 104 }],
118 ], 105 ],
119 } 106 }
120 ] 107 ]
121 } 108 }
OLDNEW
« no previous file with comments | « gyp/libjpeg-turbo-selector.gyp ('k') | platform_tools/android/gyp/dependencies.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698