WIP: Added support for giflib, updated jpeg and png

platform_tools/android/gyp/dependencies.gypi

+# Copyright 2015 Google Inc.
+#
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
 # This GYP file stores the dependencies necessary to build Skia on the Android
 # platform. The OS doesn't provide many stable libraries as part of the
 # distribution so we have to build a few of them ourselves.
 #
 # NOTE: We tried adding the gyp file to the android/ directory at the root of
 # the Skia repo, but that resulted in the generated makefiles being created
 # outside of the out directory. We may be able to move the bulk of this gyp
 # to the /android directory and put a simple shim here, but that has yet to be
 # tested.
 
@@ skipping 58 matching lines @@
         '-w',
         '-DHAVE_CONFIG_H',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
           '../third_party/externals/gif',
         ],
       }
     },
     {
       'target_name': 'png',

[djsollen, 2015/03/26 19:51:06]

I think this and jpeg are missing a conditional block where you add the platform
specific sources and flags when appropriate.

[msarett, 2015/03/26 21:06:23]

Yes, I fixed this.

       'type': 'static_library',
       'sources': [
+        '../third_party/externals/png/arm/arm_init.c',
+        '../third_party/externals/png/arm/filter_neon.S',
+        '../third_party/externals/png/arm/filter_neon_intrinsics.c',

[djsollen, 2015/03/26 19:51:06]

I don't think we can always depend on this. what happens if you try android_make
-d xoom which is a target that doesn't support neon?

[msarett, 2015/03/26 21:06:23]

Agreed.

         '../third_party/externals/png/png.c',
         '../third_party/externals/png/pngerror.c',
-        '../third_party/externals/png/pnggccrd.c',
         '../third_party/externals/png/pngget.c',
         '../third_party/externals/png/pngmem.c',
         '../third_party/externals/png/pngpread.c',
         '../third_party/externals/png/pngread.c',
         '../third_party/externals/png/pngrio.c',
         '../third_party/externals/png/pngrtran.c',
         '../third_party/externals/png/pngrutil.c',
         '../third_party/externals/png/pngset.c',
         '../third_party/externals/png/pngtrans.c',
-        '../third_party/externals/png/pngvcrd.c',
         '../third_party/externals/png/pngwio.c',
         '../third_party/externals/png/pngwrite.c',
         '../third_party/externals/png/pngwtran.c',
         '../third_party/externals/png/pngwutil.c',
       ],
       'include_dirs': [
         '../third_party/externals/png',
       ],
       'cflags': [
         '-w',
         '-fvisibility=hidden',
       ],
       'link_settings': {
         'libraries': [
           '-lz',
         ],
       },
       'direct_dependent_settings': {
         'include_dirs': [
           '../third_party/externals/png',
         ],
       }
     },
     {
       'target_name': 'jpeg',
       'type': 'static_library',
       'sources': [
+        #'../third_party/externals/jpeg/cjpeg.c',
+        '../third_party/externals/jpeg/cdjpeg.c',
+        #'../third_party/externals/jpeg/djpeg.c',

[msarett, 2015/03/26 18:22:46]

Certain new files are causing android not to build:
'../third_party/externals/jpeg/cjpeg.c',
'../third_party/externals/jpeg/djpeg.c',
'../third_party/externals/jpeg/jmem-ashmem.c',
'../third_party/externals/jpeg/mips_jidctfst.c',
'../third_party/externals/jpeg/mips_idct_le.S',

Let me know if you have any idea why.  Otherwise, I will look into this further.

[scroggo, 2015/03/26 18:29:34]

I *think* some of these are not part of the library, but separate programs (e.g.
djpeg.c).

mips will only compile on mips platforms, presumably, so these will need to be
conditional.

[msarett, 2015/03/26 21:06:23]

You are right on both counts.

         '../third_party/externals/jpeg/jcapimin.c',
         '../third_party/externals/jpeg/jcapistd.c',
         '../third_party/externals/jpeg/jccoefct.c',
         '../third_party/externals/jpeg/jccolor.c',
         '../third_party/externals/jpeg/jcdctmgr.c',
         '../third_party/externals/jpeg/jchuff.c',
         '../third_party/externals/jpeg/jcinit.c',
         '../third_party/externals/jpeg/jcmainct.c',
         '../third_party/externals/jpeg/jcmarker.c',
         '../third_party/externals/jpeg/jcmaster.c',
         '../third_party/externals/jpeg/jcomapi.c',
         '../third_party/externals/jpeg/jcparam.c',
         '../third_party/externals/jpeg/jcphuff.c',
         '../third_party/externals/jpeg/jcprepct.c',
         '../third_party/externals/jpeg/jcsample.c',
-        '../third_party/externals/jpeg/jctrans.c',
         '../third_party/externals/jpeg/jdapimin.c',
         '../third_party/externals/jpeg/jdapistd.c',
         '../third_party/externals/jpeg/jdatadst.c',
         '../third_party/externals/jpeg/jdatasrc.c',
         '../third_party/externals/jpeg/jdcoefct.c',
         '../third_party/externals/jpeg/jdcolor.c',
+        '../third_party/externals/jpeg/jdct.h',
         '../third_party/externals/jpeg/jddctmgr.c',
         '../third_party/externals/jpeg/jdhuff.c',
         '../third_party/externals/jpeg/jdinput.c',
         '../third_party/externals/jpeg/jdmainct.c',
         '../third_party/externals/jpeg/jdmarker.c',
         '../third_party/externals/jpeg/jdmaster.c',
         '../third_party/externals/jpeg/jdmerge.c',
         '../third_party/externals/jpeg/jdphuff.c',
         '../third_party/externals/jpeg/jdpostct.c',
         '../third_party/externals/jpeg/jdsample.c',
         '../third_party/externals/jpeg/jdtrans.c',
         '../third_party/externals/jpeg/jerror.c',
         '../third_party/externals/jpeg/jfdctflt.c',
         '../third_party/externals/jpeg/jfdctfst.c',
         '../third_party/externals/jpeg/jfdctint.c',
         '../third_party/externals/jpeg/jidctflt.c',
         '../third_party/externals/jpeg/jidctfst.c',
         '../third_party/externals/jpeg/jidctint.c',
+        '../third_party/externals/jpeg/jidctintelsse.c',
         '../third_party/externals/jpeg/jidctred.c',
+        '../third_party/externals/jpeg/jinclude.h',
+        #'../third_party/externals/jpeg/jmem-ashmem.c',
+        '../third_party/externals/jpeg/jmem-android.c',
+        '../third_party/externals/jpeg/jmemmgr.c',
         '../third_party/externals/jpeg/jquant1.c',
         '../third_party/externals/jpeg/jquant2.c',
+        '../third_party/externals/jpeg/jsimd_arm_neon.S',
+        '../third_party/externals/jpeg/jsimd_neon.c',
+        '../third_party/externals/jpeg/jquant2.c',
         '../third_party/externals/jpeg/jutils.c',
-        '../third_party/externals/jpeg/jmemmgr.c',
-        '../third_party/externals/jpeg/jmem-android.c', # ashmem is also available
+        #'../third_party/externals/jpeg/mips_jidctfst.c',
+        #'../third_party/externals/jpeg/mips_idct_le.S',
+        '../third_party/externals/jpeg/rdbmp.c',
+        '../third_party/externals/jpeg/rdcolmap.c',
+        '../third_party/externals/jpeg/rdgif.c',
+        '../third_party/externals/jpeg/rdppm.c',
+        '../third_party/externals/jpeg/rdswitch.c',
+        '../third_party/externals/jpeg/rdtarga.c',
+        '../third_party/externals/jpeg/wrbmp.c',
+        '../third_party/externals/jpeg/wrgif.c',
+        '../third_party/externals/jpeg/wrppm.c',
+        '../third_party/externals/jpeg/wrtarga.c',
       ],
       'include_dirs': [
         '../third_party/externals/jpeg',
       ],
       'cflags': [
         '-w',
         '-fvisibility=hidden',
         '-DAVOID_TABLES',
         '-O3',
         '-fstrict-aliasing',
@@ skipping 57 matching lines @@
           }],
         ],
         'sources': [
           '../app/jni/com_skia_SkiaSampleRenderer.cpp',
         ],
       },
 
     },
   ]
 }