From f5f7865054fbf59c65f1aa6e5bbb6393332c0463 Mon Sep 17 00:00:00 2001
From: "steveblock@chromium.org"
 <steveblock@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c>
Date: Mon, 23 Jul 2012 13:36:12 +0000
Subject: [PATCH] Hook up use_system_libjpeg for Android

Also enable it by default when builing with the Android build system.

Review URL: https://chromiumcodereview.appspot.com/10807019

git-svn-id: http://src.chromium.org/svn/trunk/src/build@147850 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
---
 android/envsetup.sh |  2 +-
 common.gypi         | 25 ++++++++++++++-----------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/android/envsetup.sh b/android/envsetup.sh
index 4a3f9fb95..9bf43490d 100755
--- a/android/envsetup.sh
+++ b/android/envsetup.sh
@@ -139,7 +139,7 @@ export STRIP=$(echo ${ANDROID_TOOLCHAIN}/*-strip)
 # The set of GYP_DEFINES to pass to gyp. Use 'readlink -e' on directories
 # to canonicalize them (remove double '/', remove trailing '/', etc).
 DEFINES+=" OS=android"
-DEFINES+=" android_build_type=0"  # Currently, Only '0' is supportted.
+DEFINES+=" android_build_type=0"
 DEFINES+=" host_os=${host_os}"
 DEFINES+=" linux_fpic=1"
 DEFINES+=" release_optimize=s"
diff --git a/common.gypi b/common.gypi
index cd2e4bf1a..587506269 100644
--- a/common.gypi
+++ b/common.gypi
@@ -512,6 +512,12 @@
         ['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)',
+        }],
       ],
     },
 
@@ -592,6 +598,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,
@@ -892,8 +899,9 @@
               }],
             ],
 
-            # 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)',
@@ -975,19 +983,14 @@
           }],
         ],
 
-        # 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"