Android: rename android_build_type gyp variable.

content/content_shell.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.
 
 {
   'variables': {
     'content_shell_product_name': 'Content Shell',
     # The "19" is so that sites that sniff for version think that this is
     # something reasonably current; the "77.34.5" is a hint that this isn't a
     # standard Chrome.
@@ skipping 590 matching lines @@
             # Skia is necessary to ensure the dependencies needed by
             # WebContents are included.
             '../skia/skia.gyp:skia',
             '<(DEPTH)/media/media.gyp:player_android',
           ],
           'sources': [
             'shell/android/shell_library_loader.cc',
             'shell/android/shell_library_loader.h',
           ],
           'conditions': [
-            ['android_build_type==1', {
+            ['android_webview_build==1', {
               'ldflags': [
                 '-lgabi++',  # For rtti
               ],
             }],
           ],
         },
         {
           'target_name': 'content_shell_java',
           'type': 'none',
           'dependencies': [
@@ skipping 57 matching lines @@
             'native_libs_paths': ['<(SHARED_LIB_DIR)/libcontent_shell_content_view.so'],
             'additional_input_paths': ['<(PRODUCT_DIR)/content_shell/assets/content_shell.pak'],
             'asset_location': '<(ant_build_out)/content_shell/assets',
           },
           'includes': [ '../build/java_apk.gypi' ],
         },
       ],
     }],  # OS=="android"
   ]
 }