Make Skia for Android libjpeg use ashmem

platform_tools/android/gyp/dependencies.gypi

Index: platform_tools/android/gyp/dependencies.gypi
diff --git a/platform_tools/android/gyp/dependencies.gypi b/platform_tools/android/gyp/dependencies.gypi
index 3c6c423990c47dbe13b31f4bc10007a7ba2e9d37..62ac7dcf794391f5d3171ebe37a7cef7c7e5cbd1 100644
--- a/platform_tools/android/gyp/dependencies.gypi
+++ b/platform_tools/android/gyp/dependencies.gypi
@@ -35,6 +35,14 @@
       ],
     },
     {
+      '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': [
@@ -102,6 +110,9 @@
     {
       'target_name': 'jpeg',
       'type': 'static_library',
+      'dependencies': [
+        'ashmem'
+      ],
       'sources': [
         '../third_party/externals/jpeg/jcapimin.c',
         '../third_party/externals/jpeg/jcapistd.c',
@@ -144,7 +155,7 @@
         '../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',
@@ -187,11 +198,13 @@
       ],
       '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',