Android content shell bringup.

build/common.gypi

Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 77f63d50ada9b434d95f5de468a7d8616b493821..912647c76194aa0fe616a3d590a684cbb810e484 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -47,6 +47,11 @@
           # Enable inclusion of touch-optimized resources.
           # TODO(joi): Rename to enable_touch_assets.
           'enable_metro%': 0,
+          
+          # Is this change part of the android upstream bringup?
+          # Allows us to *temporarily* disable certain things for
+          # staging.  Only set to 1 in a GYP_DEFINES.
+          'android_upstream_bringup%': 0,
         },
         # Copy conditionally-set variables out one scope.
         'chromeos%': '<(chromeos)',
@@ -58,6 +63,7 @@
         'enable_hidpi%': '<(enable_hidpi)',
         'enable_touch_ui%': '<(enable_touch_ui)',
         'enable_metro%': '<(enable_metro)',
+        'android_upstream_bringup%': '<(android_upstream_bringup)',
 
         # Compute the architecture that we're building on.
         'conditions': [
@@ -2400,6 +2406,9 @@
               '-lm',
             ],
             'conditions': [
+              ['android_upstream_bringup==1', {
+                'defines': ['ANDROID_UPSTREAM_BRINGUP=1',],
+              }],
               ['android_build_type==0', {
                 'ldflags': [
                   '--sysroot=<(android_ndk_sysroot)',