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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | include/images/SkJpegUtility.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gyp/libjpeg.gyp
diff --git a/gyp/libjpeg.gyp b/gyp/libjpeg.gyp
index 394f2ee0939f99fbe1dc455441a77de885b7d378..f6683101ce4950fe3e09d170d322b901bfed60b2 100644
--- a/gyp/libjpeg.gyp
+++ b/gyp/libjpeg.gyp
@@ -13,110 +13,127 @@
'use_system_libjpeg%': 0,
},
'conditions': [
- ['use_system_libjpeg==0', {
+ ['skia_os == "android"', {
'targets': [
{
'target_name': 'libjpeg',
- 'type': 'static_library',
- 'sources': [
- '../third_party/externals/libjpeg/jcapimin.c',
- '../third_party/externals/libjpeg/jcapistd.c',
- '../third_party/externals/libjpeg/jccoefct.c',
- '../third_party/externals/libjpeg/jccolor.c',
- '../third_party/externals/libjpeg/jcdctmgr.c',
- '../third_party/externals/libjpeg/jchuff.c',
- '../third_party/externals/libjpeg/jchuff.h',
- '../third_party/externals/libjpeg/jcinit.c',
- '../third_party/externals/libjpeg/jcmainct.c',
- '../third_party/externals/libjpeg/jcmarker.c',
- '../third_party/externals/libjpeg/jcmaster.c',
- '../third_party/externals/libjpeg/jcomapi.c',
- '../third_party/externals/libjpeg/jconfig.h',
- '../third_party/externals/libjpeg/jcparam.c',
- '../third_party/externals/libjpeg/jcphuff.c',
- '../third_party/externals/libjpeg/jcprepct.c',
- '../third_party/externals/libjpeg/jcsample.c',
- '../third_party/externals/libjpeg/jdapimin.c',
- '../third_party/externals/libjpeg/jdapistd.c',
- '../third_party/externals/libjpeg/jdatadst.c',
- '../third_party/externals/libjpeg/jdatasrc.c',
- '../third_party/externals/libjpeg/jdcoefct.c',
- '../third_party/externals/libjpeg/jdcolor.c',
- '../third_party/externals/libjpeg/jdct.h',
- '../third_party/externals/libjpeg/jddctmgr.c',
- '../third_party/externals/libjpeg/jdhuff.c',
- '../third_party/externals/libjpeg/jdhuff.h',
- '../third_party/externals/libjpeg/jdinput.c',
- '../third_party/externals/libjpeg/jdmainct.c',
- '../third_party/externals/libjpeg/jdmarker.c',
- '../third_party/externals/libjpeg/jdmaster.c',
- '../third_party/externals/libjpeg/jdmerge.c',
- '../third_party/externals/libjpeg/jdphuff.c',
- '../third_party/externals/libjpeg/jdpostct.c',
- '../third_party/externals/libjpeg/jdsample.c',
- '../third_party/externals/libjpeg/jerror.c',
- '../third_party/externals/libjpeg/jerror.h',
- '../third_party/externals/libjpeg/jfdctflt.c',
- '../third_party/externals/libjpeg/jfdctfst.c',
- '../third_party/externals/libjpeg/jfdctint.c',
- '../third_party/externals/libjpeg/jidctflt.c',
- '../third_party/externals/libjpeg/jidctfst.c',
- '../third_party/externals/libjpeg/jidctint.c',
- '../third_party/externals/libjpeg/jinclude.h',
- '../third_party/externals/libjpeg/jmemmgr.c',
- '../third_party/externals/libjpeg/jmemnobs.c',
- '../third_party/externals/libjpeg/jmemsys.h',
- '../third_party/externals/libjpeg/jmorecfg.h',
- '../third_party/externals/libjpeg/jpegint.h',
- '../third_party/externals/libjpeg/jpeglib.h',
- '../third_party/externals/libjpeg/jquant1.c',
- '../third_party/externals/libjpeg/jquant2.c',
- '../third_party/externals/libjpeg/jutils.c',
- '../third_party/externals/libjpeg/jversion.h',
+ 'type': 'none',
+ 'dependencies': [
+ 'android_deps.gyp:jpeg',
],
- 'direct_dependent_settings': {
- 'include_dirs': [
- '../third_party/externals/libjpeg',
- ],
- },
- 'conditions': [
- ['OS!="win"', {
- 'product_name': 'jpeg',
- 'cflags': [
- '-Wno-main', # supresses warnings about naming things "main"
- ],
- }],
- ['OS=="android"', {
- 'cflags!': [
- '-fno-rtti', # supresses warnings about invalid option of non-C++ code
- '-Wall',
- '-Werror',
- ],
- }],
- ['OS in ["linux", "freebsd", "openbsd", "solaris", "nacl"]', {
- 'cflags!': [
- '-Werror',
- ],
- }],
+ 'export_dependent_settings': [
+ 'android_deps.gyp:jpeg',
],
},
],
- }, {
- 'targets': [
- {
- 'target_name': 'libjpeg',
- 'type': 'none',
- 'direct_dependent_settings': {
- 'defines': [
- 'USE_SYSTEM_LIBJPEG',
- ],
- },
- 'link_settings': {
- 'libraries': [
- '-ljpeg',
- ],
- },
- }
+ }, { # skia_os != android
+ 'conditions': [
+ ['use_system_libjpeg==0', {
+ 'targets': [
+ {
+ 'target_name': 'libjpeg',
+ 'type': 'static_library',
+ 'sources': [
+ '../third_party/externals/libjpeg/jcapimin.c',
+ '../third_party/externals/libjpeg/jcapistd.c',
+ '../third_party/externals/libjpeg/jccoefct.c',
+ '../third_party/externals/libjpeg/jccolor.c',
+ '../third_party/externals/libjpeg/jcdctmgr.c',
+ '../third_party/externals/libjpeg/jchuff.c',
+ '../third_party/externals/libjpeg/jchuff.h',
+ '../third_party/externals/libjpeg/jcinit.c',
+ '../third_party/externals/libjpeg/jcmainct.c',
+ '../third_party/externals/libjpeg/jcmarker.c',
+ '../third_party/externals/libjpeg/jcmaster.c',
+ '../third_party/externals/libjpeg/jcomapi.c',
+ '../third_party/externals/libjpeg/jconfig.h',
+ '../third_party/externals/libjpeg/jcparam.c',
+ '../third_party/externals/libjpeg/jcphuff.c',
+ '../third_party/externals/libjpeg/jcprepct.c',
+ '../third_party/externals/libjpeg/jcsample.c',
+ '../third_party/externals/libjpeg/jdapimin.c',
+ '../third_party/externals/libjpeg/jdapistd.c',
+ '../third_party/externals/libjpeg/jdatadst.c',
+ '../third_party/externals/libjpeg/jdatasrc.c',
+ '../third_party/externals/libjpeg/jdcoefct.c',
+ '../third_party/externals/libjpeg/jdcolor.c',
+ '../third_party/externals/libjpeg/jdct.h',
+ '../third_party/externals/libjpeg/jddctmgr.c',
+ '../third_party/externals/libjpeg/jdhuff.c',
+ '../third_party/externals/libjpeg/jdhuff.h',
+ '../third_party/externals/libjpeg/jdinput.c',
+ '../third_party/externals/libjpeg/jdmainct.c',
+ '../third_party/externals/libjpeg/jdmarker.c',
+ '../third_party/externals/libjpeg/jdmaster.c',
+ '../third_party/externals/libjpeg/jdmerge.c',
+ '../third_party/externals/libjpeg/jdphuff.c',
+ '../third_party/externals/libjpeg/jdpostct.c',
+ '../third_party/externals/libjpeg/jdsample.c',
+ '../third_party/externals/libjpeg/jerror.c',
+ '../third_party/externals/libjpeg/jerror.h',
+ '../third_party/externals/libjpeg/jfdctflt.c',
+ '../third_party/externals/libjpeg/jfdctfst.c',
+ '../third_party/externals/libjpeg/jfdctint.c',
+ '../third_party/externals/libjpeg/jidctflt.c',
+ '../third_party/externals/libjpeg/jidctfst.c',
+ '../third_party/externals/libjpeg/jidctint.c',
+ '../third_party/externals/libjpeg/jinclude.h',
+ '../third_party/externals/libjpeg/jmemmgr.c',
+ '../third_party/externals/libjpeg/jmemnobs.c',
+ '../third_party/externals/libjpeg/jmemsys.h',
+ '../third_party/externals/libjpeg/jmorecfg.h',
+ '../third_party/externals/libjpeg/jpegint.h',
+ '../third_party/externals/libjpeg/jpeglib.h',
+ '../third_party/externals/libjpeg/jquant1.c',
+ '../third_party/externals/libjpeg/jquant2.c',
+ '../third_party/externals/libjpeg/jutils.c',
+ '../third_party/externals/libjpeg/jversion.h',
+ ],
+ 'direct_dependent_settings': {
+ 'include_dirs': [
+ '../third_party/externals/libjpeg',
+ ],
+ },
+ 'conditions': [
+ ['OS!="win"', {
+ 'product_name': 'jpeg',
+ 'cflags': [
+ '-Wno-main', # supresses warnings about naming things "main"
+ ],
+ }],
+ ['OS=="android"', {
+ 'cflags!': [
+ '-fno-rtti', # supresses warnings about invalid option of non-C++ code
+ '-Wall',
+ '-Werror',
+ ],
+ }],
+ ['OS in ["linux", "freebsd", "openbsd", "solaris", "nacl"]', {
+ 'cflags!': [
+ '-Werror',
+ ],
+ }],
+ ],
+ },
+ ],
+ }, {
+ 'targets': [
+ {
+ 'target_name': 'libjpeg',
+ 'type': 'none',
+ 'direct_dependent_settings': {
+ 'defines': [
+ 'USE_SYSTEM_LIBJPEG',
+ ],
+ },
+ 'link_settings': {
+ 'libraries': [
+ '-ljpeg',
+ ],
+ },
+ }
+ ],
+ }],
],
}],
],
« 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