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

Side by Side Diff: gyp/libpng.gyp

Issue 973823002: Check in pnglibconf.h so we don't need to generate it. (Closed) Base URL: https://skia.googlesource.com/skia.git@pngCodecFinalIHope_2
Patch Set: Created 5 years, 9 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 unified diff | Download patch
« no previous file with comments | « gyp/copy_file.py ('k') | third_party/libpng/LICENSE » ('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 'conditions': [ 13 'conditions': [
14 [ 'skia_libpng_static', 14 [ 'skia_libpng_static',
15 { 15 {
16 'type': 'static_library', 16 'type': 'static_library',
17 'include_dirs': [ 17 'include_dirs': [
18 '../third_party/externals/libpng', 18 '../third_party/externals/libpng',
19 # Needed for generated pnglibconf.h
20 '../third_party/libpng',
19 ], 21 ],
20 'dependencies': [ 22 'dependencies': [
21 'zlib.gyp:zlib', 23 'zlib.gyp:zlib',
22 ], 24 ],
23 'export_dependent_settings': [ 25 'export_dependent_settings': [
24 'zlib.gyp:zlib', 26 'zlib.gyp:zlib',
25 ], 27 ],
26 'direct_dependent_settings': { 28 'direct_dependent_settings': {
27 'include_dirs': [ 29 'include_dirs': [
28 '../third_party/externals/libpng', 30 '../third_party/externals/libpng',
31 # Needed for generated pnglibconf.h
32 '../third_party/libpng',
29 ], 33 ],
30 }, 34 },
31 'cflags': [ 35 'cflags': [
32 '-w', 36 '-w',
33 '-fvisibility=hidden', 37 '-fvisibility=hidden',
34 ], 38 ],
35 'conditions': [ 39 'conditions': [
36 ['not arm_neon', { 40 ['not arm_neon', {
37 'defines': [ 41 'defines': [
38 # FIXME: Why is this needed? Without it, pngpriv.h sets it 42 # FIXME: Why is this needed? Without it, pngpriv.h sets it
39 # to 2 if __ARM_NEON is defined, but shouldn't __ARM_NEON 43 # to 2 if __ARM_NEON is defined, but shouldn't __ARM_NEON
40 # not be defined since arm_neon is 0? 44 # not be defined since arm_neon is 0?
41 'PNG_ARM_NEON_OPT=0', 45 'PNG_ARM_NEON_OPT=0',
42 ], 46 ],
43 }], 47 }],
44 ], 48 ],
45 'actions': [
46 {
47 'action_name': 'generate_pngconf',
48 'variables' : {
49 'prebuilt': '../third_party/externals/libpng/scripts/pnglibcon f.h.prebuilt',
50 'generated': '../third_party/externals/libpng/pnglibconf.h',
51 },
52 'inputs': [
53 '<(prebuilt)',
54 ],
55 'outputs': [
56 '<(generated)',
57 ],
58 'action': ['python', 'copy_file.py', '<(prebuilt)', '<(generated )'],
59 },
60 ],
61 'sources': [ 49 'sources': [
62 '../third_party/externals/libpng/png.c', 50 '../third_party/externals/libpng/png.c',
63 '../third_party/externals/libpng/pngerror.c', 51 '../third_party/externals/libpng/pngerror.c',
64 '../third_party/externals/libpng/pngget.c', 52 '../third_party/externals/libpng/pngget.c',
65 '../third_party/externals/libpng/pngmem.c', 53 '../third_party/externals/libpng/pngmem.c',
66 '../third_party/externals/libpng/pngpread.c', 54 '../third_party/externals/libpng/pngpread.c',
67 '../third_party/externals/libpng/pngread.c', 55 '../third_party/externals/libpng/pngread.c',
68 '../third_party/externals/libpng/pngrio.c', 56 '../third_party/externals/libpng/pngrio.c',
69 '../third_party/externals/libpng/pngrtran.c', 57 '../third_party/externals/libpng/pngrtran.c',
70 '../third_party/externals/libpng/pngrutil.c', 58 '../third_party/externals/libpng/pngrutil.c',
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 }, 91 },
104 } 92 }
105 ] 93 ]
106 ] 94 ]
107 } 95 }
108 ] 96 ]
109 ], 97 ],
110 }, 98 },
111 ] 99 ]
112 } 100 }
OLDNEW
« no previous file with comments | « gyp/copy_file.py ('k') | third_party/libpng/LICENSE » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698