Hook up use_system_libjpeg for Android

build/common.gypi

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # IMPORTANT:
 # Please don't directly include this file if you are building via gyp_chromium,
 # since gyp_chromium is automatically forcing its inclusion.
 {
   # Variables expected to be overriden on the GYP command line (-D) or by
   # ~/.gyp/include.gypi.
@@ skipping 494 matching lines @@
         }],
 
         # Enable Skia UI text drawing incrementally on different platforms.
         # http://crbug.com/105550
         #
         # On Aura, this allows per-tile painting to be used in the browser
         # compositor.
         ['OS!="mac" and OS!="android"', {
           'use_canvas_skia%': 1,
         }],
+
+        ['OS=="android"', {
+          # When building as part of the Android system, use system libraries
+          # where possible to reduce ROM size.
+          'use_system_libjpeg%': '<(android_build_type)',
+        }],
       ],
     },
 
     # Copy conditionally-set variables out one scope.
     'branding%': '<(branding)',
     'buildtype%': '<(buildtype)',
     'target_arch%': '<(target_arch)',
     'host_arch%': '<(host_arch)',
     'library%': 'static_library',
     'toolkit_views%': '<(toolkit_views)',
@@ skipping 60 matching lines @@
     'test_isolation_mode%': '<(test_isolation_mode)',
     'test_isolation_outdir%': '<(test_isolation_outdir)',
     'enable_automation%': '<(enable_automation)',
     'enable_printing%': '<(enable_printing)',
     'enable_captive_portal_detection%': '<(enable_captive_portal_detection)',
     'force_rlz_use_chrome_net%': '<(force_rlz_use_chrome_net)',
     'enable_task_manager%': '<(enable_task_manager)',
     '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,
 
     # Default to enabled PIE; this is important for ASLR but we may need to be
     # able to turn it off for various reasons.
     'linux_disable_pie%': 0,
 
     # The release channel that this build targets. This is used to restrict
     # channel-specific build options, like which installer packages to create.
@@ skipping 280 matching lines @@
                 'android_app_abi%': 'x86',
               }],
               ['target_arch=="arm" and armv7==0', {
                 'android_app_abi%': 'armeabi',
               }],
               ['target_arch=="arm" and armv7==1', {
                 'android_app_abi%': 'armeabi-v7a',
               }],
             ],
 
-            # Switch between different build types, currently only '0' is
-            # supported.
+            # Sets whether we're building with the Android SDK/NDK (and hence
+            # with Ant, value 0), or as part of the Android system (and hence
+            # with the Android build system, value 1).
             'android_build_type%': 0,
           },
           'android_ndk_root%': '<(android_ndk_root)',
           'android_ndk_sysroot': '<(android_ndk_root)/platforms/android-9/arch-<(target_arch)',
           'android_build_type%': '<(android_build_type)',
           'android_app_abi%': '<(android_app_abi)',
         },
         'android_ndk_root%': '<(android_ndk_root)',
         'android_ndk_sysroot': '<(android_ndk_sysroot)',
         'android_ndk_include': '<(android_ndk_sysroot)/usr/include',
@@ skipping 61 matching lines @@
           # code. Java code stacktraces will be collected by GoogleFeedback when
           # chrome is installed by either market or bazaar where the installer
           # package is automatically set to AndroidFeedback.
           ['buildtype=="Official"', {
             'linux_breakpad%': 1,
           }, {
             'linux_breakpad%': 0,
           }],
         ],
 
-        # TODO(steveblock): Investigate using the system versions of sqlite and
-        # libjpeg.
-        # Enable to use system sqlite.
+        # When building as part of the Android system, use system libraries
+        # where possible to reduce ROM size.
+        # TODO(steveblock): Investigate using the system version of 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.
         'use_system_icu%': '<(android_build_type)',
-        # Enable to use the system stlport, otherwise statically
-        # link the NDK one?
         'use_system_stlport%': '<(android_build_type)',
+
         # Copy it out one scope.
         'android_build_type%': '<(android_build_type)',
       }],  # OS=="android"
       ['OS=="mac"', {
         # Enable clang on mac by default!
         'clang%': 1,
         # Compile in Breakpad support by default so that it can be
         # tested, even if it is not enabled by default at runtime.
         'mac_breakpad_compiled_in%': 1,
         'conditions': [
@@ skipping 2308 matching lines @@
     # settings in target dicts.  SYMROOT is a special case, because many other
     # Xcode variables depend on it, including variables such as
     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something
     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
     # files to appear (when present) in the UI as actual files and not red
     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
     # and therefore SYMROOT, needs to be set at the project level.
     'SYMROOT': '<(DEPTH)/xcodebuild',
   },
 }