Rename android_build_type to android_webview_build.

build/android.gypi

 # Copyright 2012 the V8 project authors. All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 #       notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 #       copyright notice, this list of conditions and the following
 #       disclaimer in the documentation and/or other materials provided
@@ skipping 17 matching lines @@
 # Definitions for building standalone V8 binaries to run on Android.
 # This is mostly excerpted from:
 # http://src.chromium.org/viewvc/chrome/trunk/src/build/common.gypi
 
 {
   'variables': {
     # Location of Android NDK.
     'variables': {
       'android_ndk_root%': '<!(/bin/echo -n $ANDROID_NDK_ROOT)',
       'android_toolchain%': '<!(/bin/echo -n $ANDROID_TOOLCHAIN)',
-      # Switch between different build types, currently only '0' is
-      # supported.
-      'android_build_type%': 0,
+      # This is set when building the Android WebView inside the Android build
+      # system, using the 'android' gyp backend.
+      'android_webview_build%': 0,
     },
     'conditions': [
       ['android_ndk_root==""', {
         'variables': {
           'android_sysroot': '<(android_toolchain)/sysroot/',
           'android_stlport': '<(android_toolchain)/sources/cxx-stl/stlport/',
         },
         'android_include': '<(android_sysroot)/usr/include',
         'android_lib': '<(android_sysroot)/usr/lib',
         'android_stlport_include': '<(android_stlport)/stlport',
         'android_stlport_libs': '<(android_stlport)/libs',
       }, {
         'variables': {
           'android_sysroot': '<(android_ndk_root)/platforms/android-9/arch-<(android_target_arch)',
           'android_stlport': '<(android_ndk_root)/sources/cxx-stl/stlport/',
         },
         'android_include': '<(android_sysroot)/usr/include',
         'android_lib': '<(android_sysroot)/usr/lib',
         'android_stlport_include': '<(android_stlport)/stlport',
         'android_stlport_libs': '<(android_stlport)/libs',
       }],
     ],
     # Enable to use the system stlport, otherwise statically
     # link the NDK one?
-    'use_system_stlport%': '<(android_build_type)',
+    'use_system_stlport%': '<(android_webview_build)',
     'android_stlport_library': 'stlport_static',
     # Copy it out one scope.
-    'android_build_type%': '<(android_build_type)',
+    'android_webview_build%': '<(android_webview_build)',
     'OS': 'android',
   },  # variables
   'target_defaults': {
     'defines': [
       'ANDROID',
       'V8_ANDROID_LOG_STDOUT',
     ],
     'configurations': {
       'Release': {
         'cflags!': [
@@ skipping 55 matching lines @@
           'libraries': [
             '-l<(android_stlport_library)',
             # Manually link the libgcc.a that the cross compiler uses.
             '<!($CC -print-libgcc-file-name)',
             '-lc',
             '-ldl',
             '-lstdc++',
             '-lm',
         ],
         'conditions': [
-          ['android_build_type==0', {
+          ['android_webview_build==0', {
             'ldflags': [
               '-Wl,-rpath-link=<(android_lib)',
               '-L<(android_lib)',
             ],
           }],
           ['target_arch == "arm"', {
             'ldflags': [
               # Enable identical code folding to reduce size.
               '-Wl,--icf=safe',
             ],
@@ skipping 95 matching lines @@
         'ldflags!': [
           '-Wl,-z,noexecstack',
           '-Wl,--gc-sections',
           '-Wl,-O1',
           '-Wl,--as-needed',
         ],
       }],
     ],  # target_conditions
   },  # target_defaults
 }