Rolling back r3611 until the Android compilation issue is resolved

git-svn-id: http://skia.googlecode.com/svn/trunk@3613 2bbb7eff-a529-9590-31e7-b0007b416f81

diff --git a/gyp/gmslides.gypi b/gyp/gmslides.gypi
index 8442d7d2fcd40f79c20d0e285aeb0b886bafc465..491af68e6436020105da76518c65cf87222601fa 100644 (file)
--- a/gyp/gmslides.gypi
+++ b/gyp/gmslides.gypi
@@ -14,7 +14,6 @@
     '../gm/complexclip2.cpp',
     '../gm/convexpaths.cpp',
     '../gm/cubicpaths.cpp',
-    '../gm/cmykjpeg.cpp',
     '../gm/degeneratesegments.cpp',
     '../gm/drawbitmaprect.cpp',
     '../gm/emptypath.cpp',

diff --git a/gyp/images.gyp b/gyp/images.gyp
index b92c9db34d4be87c4aa938b58cc760828a9674b7..a4bdcd00ff341b937f481d18011401e2e2a698d2 100644 (file)
--- a/gyp/images.gyp
+++ b/gyp/images.gyp
@@ -4,12 +4,9 @@
       'target_name': 'images',
       'type': 'static_library',
       'dependencies': [
-        'libjpeg.gyp:*',
+        'libjpeg.gyp:libjpeg',
         'utils.gyp:utils',
       ],
-      'export_dependent_settings': [
-        'libjpeg.gyp:*',
-      ],
       'include_dirs': [
         '../include/config',
         '../include/core',
@@ -31,7 +28,6 @@
         '../src/images/SkFlipPixelRef.cpp',
         '../src/images/SkImageDecoder.cpp',
         '../src/images/SkImageDecoder_Factory.cpp',
-        '../src/images/SkImageDecoder_libjpeg.cpp',
         '../src/images/SkImageDecoder_libbmp.cpp',
         '../src/images/SkImageDecoder_libgif.cpp',
         '../src/images/SkImageDecoder_libico.cpp',
@@ -56,11 +52,14 @@
       'conditions': [
         [ 'skia_os == "win"', {
           'sources!': [
+            '../include/images/SkJpegUtility.h',
+
             '../src/images/SkFDStream.cpp',
             '../src/images/SkImageDecoder_Factory.cpp',
             '../src/images/SkImageDecoder_libgif.cpp',
             '../src/images/SkImageDecoder_libpng.cpp',
             '../src/images/SkImageEncoder_Factory.cpp',
+            '../src/images/SkJpegUtility.cpp',
             '../src/images/SkMovie_gif.cpp',
           ],
           'link_settings': {
@@ -75,10 +74,13 @@
         }],
         [ 'skia_os == "mac"', {
           'sources!': [
+            '../include/images/SkJpegUtility.h',
+
             '../src/images/SkImageDecoder_Factory.cpp',
             '../src/images/SkImageDecoder_libpng.cpp',
             '../src/images/SkImageDecoder_libgif.cpp',
             '../src/images/SkImageEncoder_Factory.cpp',
+            '../src/images/SkJpegUtility.cpp',
             '../src/images/SkMovie_gif.cpp',
           ],
         },{ #else if skia_os != mac
@@ -88,7 +90,10 @@
         }],
         [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', {
           'sources!': [
+            '../include/images/SkJpegUtility.h',
+
             '../src/images/SkImageDecoder_libgif.cpp',
+            '../src/images/SkJpegUtility.cpp',
             '../src/images/SkMovie_gif.cpp',
           ],
           # libpng stuff:
@@ -107,6 +112,7 @@
         }],
         [ 'skia_os == "android"', {
           'sources!': [
+            '../src/images/SkJpegUtility.cpp',
           ],
           'dependencies': [
              'android_system.gyp:gif',

diff --git a/gyp/libjpeg.gyp b/gyp/libjpeg.gyp
index dcf14509a2b6688c6450ea6445752d317cd2b84e..b7ce7a81141edaf92c56f7b6e5989c0c7a517fe0 100644 (file)
--- a/gyp/libjpeg.gyp
+++ b/gyp/libjpeg.gyp
@@ -76,7 +76,7 @@
           ],
           'direct_dependent_settings': {
             'include_dirs': [
-              '../third_party/externals/libjpeg',
+              '.',
             ],
           },
           'conditions': [