Make Skia for Android libjpeg use ashmem

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
@@ skipping 17 matching lines @@
       },
       'sources': [
         '../third_party/cpufeatures/cpu-features.c',
         '../third_party/cpufeatures/cpu-features.h',
       ],
       'cflags': [
         '-w',
       ],
     },
     {
+      'target_name': 'ashmem',
+      'type': 'static_library',
+      'sources': [
+        '../third_party/cutils/ashmem.h',

[djsollen, 2015/04/27 17:12:25]

let's put this code into...

../third_party/ashmem/cutils/ashmem.h so that it is clear in the directory
structure what this is.

[msarett, 2015/04/27 17:32:49]

Done.

+        '../third_party/cutils/ashmem-dev.c'

[msarett, 2015/04/27 16:01:57]

Directory is named cutils so we can avoid making local modifications to
jmem-ashmem.c

+      ],

[djsollen, 2015/04/27 17:12:25]

add 

'direct_dependent_settings': {
  'include_dirs': [
    '../third_party/ashmem',
  ]
},

[msarett, 2015/04/27 17:32:49]

Done.

+    },
+    {
       'target_name': 'expat',
       'type': 'static_library',
       'sources': [
         '../third_party/externals/expat/lib/xmlparse.c',
         '../third_party/externals/expat/lib/xmlrole.c',
         '../third_party/externals/expat/lib/xmltok.c',
       ],
       'include_dirs': [
         '../third_party/externals/expat',
         '../third_party/externals/expat/lib',
@@ skipping 47 matching lines @@
       },
       'direct_dependent_settings': {
         'include_dirs': [
           '../third_party/externals/png',
         ],
       }
     },
     {
       'target_name': 'jpeg',
       'type': 'static_library',
+      'dependencies': [
+        'ashmem'
+      ],
       'sources': [
         '../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',
@@ skipping 22 matching lines @@
         '../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/jidctred.c',
-        '../third_party/externals/jpeg/jmem-android.c',
+        '../third_party/externals/jpeg/jmem-ashmem.c',
         '../third_party/externals/jpeg/jmemmgr.c',
         '../third_party/externals/jpeg/jquant1.c',
         '../third_party/externals/jpeg/jquant2.c',
         '../third_party/externals/jpeg/jutils.c',
       ],
       'conditions': [
         [ 'arm_neon == 1 and skia_clang_build == 0',
           {
             'sources' : [
               '../third_party/externals/jpeg/armv6_idct.S',
@@ skipping 22 matching lines @@
               '../third_party/externals/jpeg/jidctintelsse.c',
             ],
             'defines' : [
               'ANDROID_INTELSSE2_IDCT',
             ],
           },
         ],
       ],
       'include_dirs': [
         '../third_party/externals/jpeg',
+        '../third_party/',

[djsollen, 2015/04/27 17:12:25]

remove this

[msarett, 2015/04/27 17:32:49]

Done.

       ],
       'cflags': [
         '-w',
         '-fvisibility=hidden',
         '-DAVOID_TABLES',
+        '-DUSE_ANDROID_ASHMEM',
         '-O3',
         '-fstrict-aliasing',
         '-fprefetch-loop-arrays',
         '-DANDROID_TILE_BASED_DECODE',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
           '../third_party/externals/jpeg',
         ],
       }
@@ skipping 49 matching lines @@
           }],
         ],
         'sources': [
           '../app/jni/com_skia_SkiaSampleRenderer.cpp',
         ],
       },
 
     },
   ]
 }