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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: gyp/libjpeg.gyp

Issue 12438025: Upstream changes from Android for decoding jpeg images. (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: addressing comments Created 7 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | include/images/SkJpegUtility.h » ('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 2012 The Chromium Authors. All rights reserved. 1 # Copyright 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 # This is a copy of ../third_party/externals/libjpeg/libjpeg.gyp , modified 5 # This is a copy of ../third_party/externals/libjpeg/libjpeg.gyp , modified
6 # such that all source paths point into that directory. 6 # such that all source paths point into that directory.
7 # See http://code.google.com/p/skia/issues/detail?id=543 ('wrap libjpeg.gyp 7 # See http://code.google.com/p/skia/issues/detail?id=543 ('wrap libjpeg.gyp
8 # from Chrome's libjpeg port, rather than making our own copy') for a better 8 # from Chrome's libjpeg port, rather than making our own copy') for a better
9 # long-term solution. 9 # long-term solution.
10 10
11 { 11 {
12 'variables': { 12 'variables': {
13 'use_system_libjpeg%': 0, 13 'use_system_libjpeg%': 0,
14 }, 14 },
15 'conditions': [ 15 'conditions': [
16 ['use_system_libjpeg==0', { 16 ['skia_os == "android"', {
17 'targets': [
18 {
19 'target_name': 'libjpeg',
20 'type': 'static_library',
21 'sources': [
22 '../third_party/externals/libjpeg/jcapimin.c',
23 '../third_party/externals/libjpeg/jcapistd.c',
24 '../third_party/externals/libjpeg/jccoefct.c',
25 '../third_party/externals/libjpeg/jccolor.c',
26 '../third_party/externals/libjpeg/jcdctmgr.c',
27 '../third_party/externals/libjpeg/jchuff.c',
28 '../third_party/externals/libjpeg/jchuff.h',
29 '../third_party/externals/libjpeg/jcinit.c',
30 '../third_party/externals/libjpeg/jcmainct.c',
31 '../third_party/externals/libjpeg/jcmarker.c',
32 '../third_party/externals/libjpeg/jcmaster.c',
33 '../third_party/externals/libjpeg/jcomapi.c',
34 '../third_party/externals/libjpeg/jconfig.h',
35 '../third_party/externals/libjpeg/jcparam.c',
36 '../third_party/externals/libjpeg/jcphuff.c',
37 '../third_party/externals/libjpeg/jcprepct.c',
38 '../third_party/externals/libjpeg/jcsample.c',
39 '../third_party/externals/libjpeg/jdapimin.c',
40 '../third_party/externals/libjpeg/jdapistd.c',
41 '../third_party/externals/libjpeg/jdatadst.c',
42 '../third_party/externals/libjpeg/jdatasrc.c',
43 '../third_party/externals/libjpeg/jdcoefct.c',
44 '../third_party/externals/libjpeg/jdcolor.c',
45 '../third_party/externals/libjpeg/jdct.h',
46 '../third_party/externals/libjpeg/jddctmgr.c',
47 '../third_party/externals/libjpeg/jdhuff.c',
48 '../third_party/externals/libjpeg/jdhuff.h',
49 '../third_party/externals/libjpeg/jdinput.c',
50 '../third_party/externals/libjpeg/jdmainct.c',
51 '../third_party/externals/libjpeg/jdmarker.c',
52 '../third_party/externals/libjpeg/jdmaster.c',
53 '../third_party/externals/libjpeg/jdmerge.c',
54 '../third_party/externals/libjpeg/jdphuff.c',
55 '../third_party/externals/libjpeg/jdpostct.c',
56 '../third_party/externals/libjpeg/jdsample.c',
57 '../third_party/externals/libjpeg/jerror.c',
58 '../third_party/externals/libjpeg/jerror.h',
59 '../third_party/externals/libjpeg/jfdctflt.c',
60 '../third_party/externals/libjpeg/jfdctfst.c',
61 '../third_party/externals/libjpeg/jfdctint.c',
62 '../third_party/externals/libjpeg/jidctflt.c',
63 '../third_party/externals/libjpeg/jidctfst.c',
64 '../third_party/externals/libjpeg/jidctint.c',
65 '../third_party/externals/libjpeg/jinclude.h',
66 '../third_party/externals/libjpeg/jmemmgr.c',
67 '../third_party/externals/libjpeg/jmemnobs.c',
68 '../third_party/externals/libjpeg/jmemsys.h',
69 '../third_party/externals/libjpeg/jmorecfg.h',
70 '../third_party/externals/libjpeg/jpegint.h',
71 '../third_party/externals/libjpeg/jpeglib.h',
72 '../third_party/externals/libjpeg/jquant1.c',
73 '../third_party/externals/libjpeg/jquant2.c',
74 '../third_party/externals/libjpeg/jutils.c',
75 '../third_party/externals/libjpeg/jversion.h',
76 ],
77 'direct_dependent_settings': {
78 'include_dirs': [
79 '../third_party/externals/libjpeg',
80 ],
81 },
82 'conditions': [
83 ['OS!="win"', {
84 'product_name': 'jpeg',
85 'cflags': [
86 '-Wno-main', # supresses warnings about naming things "main"
87 ],
88 }],
89 ['OS=="android"', {
90 'cflags!': [
91 '-fno-rtti', # supresses warnings about invalid option of non-C++ code
92 '-Wall',
93 '-Werror',
94 ],
95 }],
96 ['OS in ["linux", "freebsd", "openbsd", "solaris", "nacl"]', {
97 'cflags!': [
98 '-Werror',
99 ],
100 }],
101 ],
102 },
103 ],
104 }, {
105 'targets': [ 17 'targets': [
106 { 18 {
107 'target_name': 'libjpeg', 19 'target_name': 'libjpeg',
108 'type': 'none', 20 'type': 'none',
109 'direct_dependent_settings': { 21 'dependencies': [
110 'defines': [ 22 'android_deps.gyp:jpeg',
111 'USE_SYSTEM_LIBJPEG', 23 ],
112 ], 24 'export_dependent_settings': [
113 }, 25 'android_deps.gyp:jpeg',
114 'link_settings': { 26 ],
115 'libraries': [ 27 },
116 '-ljpeg', 28 ],
117 ], 29 }, { # skia_os != android
118 }, 30 'conditions': [
119 } 31 ['use_system_libjpeg==0', {
32 'targets': [
33 {
34 'target_name': 'libjpeg',
35 'type': 'static_library',
36 'sources': [
37 '../third_party/externals/libjpeg/jcapimin.c',
38 '../third_party/externals/libjpeg/jcapistd.c',
39 '../third_party/externals/libjpeg/jccoefct.c',
40 '../third_party/externals/libjpeg/jccolor.c',
41 '../third_party/externals/libjpeg/jcdctmgr.c',
42 '../third_party/externals/libjpeg/jchuff.c',
43 '../third_party/externals/libjpeg/jchuff.h',
44 '../third_party/externals/libjpeg/jcinit.c',
45 '../third_party/externals/libjpeg/jcmainct.c',
46 '../third_party/externals/libjpeg/jcmarker.c',
47 '../third_party/externals/libjpeg/jcmaster.c',
48 '../third_party/externals/libjpeg/jcomapi.c',
49 '../third_party/externals/libjpeg/jconfig.h',
50 '../third_party/externals/libjpeg/jcparam.c',
51 '../third_party/externals/libjpeg/jcphuff.c',
52 '../third_party/externals/libjpeg/jcprepct.c',
53 '../third_party/externals/libjpeg/jcsample.c',
54 '../third_party/externals/libjpeg/jdapimin.c',
55 '../third_party/externals/libjpeg/jdapistd.c',
56 '../third_party/externals/libjpeg/jdatadst.c',
57 '../third_party/externals/libjpeg/jdatasrc.c',
58 '../third_party/externals/libjpeg/jdcoefct.c',
59 '../third_party/externals/libjpeg/jdcolor.c',
60 '../third_party/externals/libjpeg/jdct.h',
61 '../third_party/externals/libjpeg/jddctmgr.c',
62 '../third_party/externals/libjpeg/jdhuff.c',
63 '../third_party/externals/libjpeg/jdhuff.h',
64 '../third_party/externals/libjpeg/jdinput.c',
65 '../third_party/externals/libjpeg/jdmainct.c',
66 '../third_party/externals/libjpeg/jdmarker.c',
67 '../third_party/externals/libjpeg/jdmaster.c',
68 '../third_party/externals/libjpeg/jdmerge.c',
69 '../third_party/externals/libjpeg/jdphuff.c',
70 '../third_party/externals/libjpeg/jdpostct.c',
71 '../third_party/externals/libjpeg/jdsample.c',
72 '../third_party/externals/libjpeg/jerror.c',
73 '../third_party/externals/libjpeg/jerror.h',
74 '../third_party/externals/libjpeg/jfdctflt.c',
75 '../third_party/externals/libjpeg/jfdctfst.c',
76 '../third_party/externals/libjpeg/jfdctint.c',
77 '../third_party/externals/libjpeg/jidctflt.c',
78 '../third_party/externals/libjpeg/jidctfst.c',
79 '../third_party/externals/libjpeg/jidctint.c',
80 '../third_party/externals/libjpeg/jinclude.h',
81 '../third_party/externals/libjpeg/jmemmgr.c',
82 '../third_party/externals/libjpeg/jmemnobs.c',
83 '../third_party/externals/libjpeg/jmemsys.h',
84 '../third_party/externals/libjpeg/jmorecfg.h',
85 '../third_party/externals/libjpeg/jpegint.h',
86 '../third_party/externals/libjpeg/jpeglib.h',
87 '../third_party/externals/libjpeg/jquant1.c',
88 '../third_party/externals/libjpeg/jquant2.c',
89 '../third_party/externals/libjpeg/jutils.c',
90 '../third_party/externals/libjpeg/jversion.h',
91 ],
92 'direct_dependent_settings': {
93 'include_dirs': [
94 '../third_party/externals/libjpeg',
95 ],
96 },
97 'conditions': [
98 ['OS!="win"', {
99 'product_name': 'jpeg',
100 'cflags': [
101 '-Wno-main', # supresses warnings about naming things "main"
102 ],
103 }],
104 ['OS=="android"', {
105 'cflags!': [
106 '-fno-rtti', # supresses warnings about invalid option of non -C++ code
107 '-Wall',
108 '-Werror',
109 ],
110 }],
111 ['OS in ["linux", "freebsd", "openbsd", "solaris", "nacl"]', {
112 'cflags!': [
113 '-Werror',
114 ],
115 }],
116 ],
117 },
118 ],
119 }, {
120 'targets': [
121 {
122 'target_name': 'libjpeg',
123 'type': 'none',
124 'direct_dependent_settings': {
125 'defines': [
126 'USE_SYSTEM_LIBJPEG',
127 ],
128 },
129 'link_settings': {
130 'libraries': [
131 '-ljpeg',
132 ],
133 },
134 }
135 ],
136 }],
120 ], 137 ],
121 }], 138 }],
122 ], 139 ],
123 } 140 }
124 141
125 # Local Variables: 142 # Local Variables:
126 # tab-width:2 143 # tab-width:2
127 # indent-tabs-mode:nil 144 # indent-tabs-mode:nil
128 # End: 145 # End:
129 # vim: set expandtab tabstop=2 shiftwidth=2: 146 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « no previous file | include/images/SkJpegUtility.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698