Hook up use_system_libjpeg for Android

build/common.gypi

Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index cd2e4bf1a35cbbfd49ea4f957dd56e4b492278a8..eb2c0eb55f75bcb9bae70b1a6e2ccd3cf48eecda 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -512,6 +512,11 @@
         ['OS!="mac" and OS!="android"', {
           'use_canvas_skia%': 1,
         }],
+
+        ['OS=="android"', {
+          # Enable to use system libjpeg.

[Hironori Bono, 2012/07/21 06:07:00]

nit: is it possible to add a comment to describe the reason why Android use the
system libjpeg, e.g. "Use system libjpeg to reduce the ROM footprint"?

[Steve Block, 2012/07/23 12:41:09]

Done.

+          'use_system_libjpeg%': '<(android_build_type)',
+        }],
       ],
     },
 
@@ -592,6 +597,7 @@
     'sas_dll_path%': '<(sas_dll_path)',
     'wix_path%': '<(wix_path)',
     'android_upstream_bringup%': '<(android_upstream_bringup)',
+    'use_system_libjpeg%': '<(use_system_libjpeg)',
 
     # Use system yasm instead of bundled one.
     'use_system_yasm%': 0,
@@ -975,12 +981,9 @@
           }],
         ],
 
-        # TODO(steveblock): Investigate using the system versions of sqlite and
-        # libjpeg.
+        # TODO(steveblock): Investigate using the system version of sqlite.
         # Enable to use system sqlite.
         'use_system_sqlite%': 0,  # '<(android_build_type)',
-        # Enable to use system libjpeg.
-        'use_system_libjpeg%': 0,  # '<(android_build_type)',
         # Enable to use the system expat.
         'use_system_expat%': '<(android_build_type)',
         # Enable to use the system ICU.