Android: rename android_build_type gyp variable.

content/content.gyp

 # 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.
 
 {
   'variables': {
     'chromium_code': 1,  # Use higher warning level.
     'directxsdk_exists': '<!(python <(DEPTH)/build/dir_exists.py ../third_party/directxsdk)',
     'conditions': [
       ['inside_chromium_build==0', {
@@ skipping 12 matching lines @@
         ],
       }],
       # TODO(jschuh): Remove this after crbug.com/173851 gets fixed.
       ['OS=="win" and target_arch=="x64"', {
         'msvs_settings': {
           'VCCLCompilerTool': {
             'AdditionalOptions': ['/bigobj'],
           },
         },
       }],
-      
+

[benm (inactive), 2013/03/11 17:23:29]

nit: remove \n?

[Torne, 2013/03/11 17:31:11]

Done.

     ],
   },
   'conditions': [
     ['inside_chromium_build==1', {
       'includes': [
         'content_tests.gypi',
       ],
     }],
     ['OS != "ios"', {
       'includes': [
@@ skipping 271 matching lines @@
             'result_codes_java',
           ],
           'variables': {
             'java_in_dir': '../content/public/android/java',
             'has_java_resources': 1,
             'R_package': 'org.chromium.content',
             'R_package_relpath': 'org/chromium/content',
             'java_strings_grd': 'android_content_strings.grd',
           },
           'conditions': [
-            ['android_build_type == 0', {
+            ['android_webview_build == 0', {
               'dependencies': [
                 '../third_party/eyesfree/eyesfree.gyp:eyesfree_java',
                 '../third_party/guava/guava.gyp:guava_javalib',
               ],
             }],
           ],
           'includes': [ '../build/java.gypi' ],
         },
         {
           'target_name': 'page_transition_types_java',
@@ skipping 62 matching lines @@
             'include_dirs': [
               '<(SHARED_INTERMEDIATE_DIR)/content',
             ],
           },
           'includes': [ 'content_jni.gypi' ],
         },
       ],
     }],  # OS == "android"
   ],
 }