Android: rename android_build_type gyp variable.

Rename the "android_build_type" gyp variable to "android_webview_build"
to better describe what it does. There are still references in WebKit
and V8 that need to be changed before the original variable can be
removed.

BUG=184431

Review URL: https://codereview.chromium.org/12730006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@187556 0039d316-1c4b-4281-b951-d872f2087c98

12 files changed, 37 insertions, 31 deletions

diff --git a/android_webview/android_webview.gyp b/android_webview/android_webview.gyp
index 87249f9..edc6c05 100644
--- a/android_webview/android_webview.gyp
+++ b/android_webview/android_webview.gyp
@@ -24,7 +24,7 @@
         'lib/main/webview_entry_point.cc',
       ],
       'conditions': [
-        ['android_build_type != 0', {
+        ['android_webview_build == 1', {
           'libraries': [
             # The "android" gyp backend doesn't quite handle static libraries'
             # dependencies correctly; force this to be linked as a workaround.
diff --git a/base/base.gyp b/base/base.gyp
index 0b08c90..9123db4 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -151,7 +151,7 @@
             '../build/android/cpufeatures.gypi',
           ],
         }],
-        ['OS == "android" and _toolset == "target" and android_build_type == 0', {
+        ['OS == "android" and _toolset == "target" and android_webview_build == 0', {
           'dependencies': [
             'base_java',
           ],
@@ -1131,7 +1131,7 @@
           },
           'includes': [ '../build/java.gypi' ],
           'conditions': [
-            ['android_build_type==0', {
+            ['android_webview_build==0', {
               'dependencies': [
                 '../third_party/jsr-305/jsr-305.gyp:jsr_305_javalib',
               ],
diff --git a/build/android/cpufeatures.gypi b/build/android/cpufeatures.gypi
index 17b262c..96de282 100644
--- a/build/android/cpufeatures.gypi
+++ b/build/android/cpufeatures.gypi
@@ -7,7 +7,7 @@
 # gyp file in the checked-in NDK to build it.
 {
   'conditions': [
-    ['android_build_type != 0', {
+    ['android_webview_build == 1', {
       'libraries': [
         'cpufeatures.a'
       ],
diff --git a/build/android/envsetup_functions.sh b/build/android/envsetup_functions.sh
index 5ad34b7..88f4421 100755
--- a/build/android/envsetup_functions.sh
+++ b/build/android/envsetup_functions.sh
@@ -284,6 +284,8 @@ ${ANDROID_SDK_VERSION}
           '${ANDROID_BUILD_TOP}')")
       ;;
   esac
+  DEFINES+=" android_webview_build=1"
+  # temporary until all uses of android_build_type are gone (crbug.com/184431)
   DEFINES+=" android_build_type=1"
   DEFINES+=" android_src=\$(GYP_ABS_ANDROID_TOP_DIR)"
   DEFINES+=" android_sdk=\$(GYP_ABS_ANDROID_TOP_DIR)/${ANDROID_SDK}"
diff --git a/build/common.gypi b/build/common.gypi
index c71e889..e58f8c6 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -102,10 +102,11 @@
         # building on.
         'target_arch%': '<(host_arch)',
 
-        # 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,
+        # This is set when building the Android WebView inside the Android
+        # build system, using the 'android' gyp backend. The WebView code is
+        # still built when this is unset, but builds using the normal chromium
+        # build system.
+        'android_webview_build%': 0,
 
         # Sets whether chrome is built for google tv device.
         'google_tv%': 0,
@@ -169,7 +170,7 @@
       'enable_viewport%': '<(enable_viewport)',
       'enable_hidpi%': '<(enable_hidpi)',
       'enable_touch_ui%': '<(enable_touch_ui)',
-      'android_build_type%': '<(android_build_type)',
+      'android_webview_build%': '<(android_webview_build)',
       'google_tv%': '<(google_tv)',
       'enable_app_list%': '<(enable_app_list)',
       'enable_message_center%': '<(enable_message_center)',
@@ -483,18 +484,18 @@
         }],
 
         # Enable autofill dialog for Android and Views-enabled platforms for now.
-        ['toolkit_views==1 or (OS=="android" and android_build_type==0)', {
+        ['toolkit_views==1 or (OS=="android" and android_webview_build==0)', {
           'enable_autofill_dialog%': 1
         }],
 
-        ['OS=="android" and android_build_type==0', {
+        ['OS=="android" and android_webview_build==0', {
           'enable_webrtc%': 1,
         }],
 
         # Disable WebRTC for building WebView as part of Android system.
         # TODO(boliu): Decide if we want WebRTC, and if so, also merge
         # the necessary third_party repositories.
-        ['OS=="android" and android_build_type==1', {
+        ['OS=="android" and android_webview_build==1', {
           'enable_webrtc%': 0,
         }],
 
@@ -588,7 +589,7 @@
         ['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)',
+          'use_system_libjpeg%': '<(android_webview_build)',
         }],
 
         # Enable Settings App only on Windows.
@@ -727,7 +728,7 @@
     'wix_path%': '<(wix_path)',
     'use_libjpeg_turbo%': '<(use_libjpeg_turbo)',
     'use_system_libjpeg%': '<(use_system_libjpeg)',
-    'android_build_type%': '<(android_build_type)',
+    'android_webview_build%': '<(android_webview_build)',
     'google_tv%': '<(google_tv)',
     'enable_app_list%': '<(enable_app_list)',
     'enable_message_center%': '<(enable_message_center)',
@@ -990,6 +991,10 @@
     'android_app_version_name%': 'Developer Build',
     'android_app_version_code%': 0,
 
+    # Temporarily set android_build_type until all uses of it have been renamed.
+    # http://crbug.com/184431
+    'android_build_type%': '<(android_webview_build)',
+
     'sas_dll_exists': '<!(python <(DEPTH)/build/dir_exists.py <(sas_dll_path))',
     'wix_exists': '<!(python <(DEPTH)/build/dir_exists.py <(wix_path))',
 
@@ -1205,15 +1210,15 @@
         # 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)',
-        'use_system_expat%': '<(android_build_type)',
-        'use_system_icu%': '<(android_build_type)',
-        'use_system_stlport%': '<(android_build_type)',
+        'use_system_sqlite%': 0,  # '<(android_webview_build)',
+        'use_system_expat%': '<(android_webview_build)',
+        'use_system_icu%': '<(android_webview_build)',
+        'use_system_stlport%': '<(android_webview_build)',
 
         'enable_managed_users%': 0,
 
         # Copy it out one scope.
-        'android_build_type%': '<(android_build_type)',
+        'android_webview_build%': '<(android_webview_build)',
       }],  # OS=="android"
       ['OS=="mac"', {
         'variables': {
@@ -3194,7 +3199,7 @@
                   '-mllvm -asan-globals=0',
                 ],
               }],
-              ['android_build_type==0', {
+              ['android_webview_build==0', {
                 'defines': [
                   # The NDK has these things, but doesn't define the constants
                   # to say that it does. Define them here instead.
@@ -3207,7 +3212,7 @@
                   '--sysroot=<(android_ndk_sysroot)',
                 ],
               }],
-              ['android_build_type==1', {
+              ['android_webview_build==1', {
                 'include_dirs': [
                   # OpenAL headers from the Android tree.
                   '<(android_src)/frameworks/wilhelm/include',
@@ -3236,7 +3241,7 @@
                   '-Wno-sign-promo',
                 ],
               }],
-              ['android_build_type==1 and chromium_code==0', {
+              ['android_webview_build==1 and chromium_code==0', {
                 'cflags': [
                   # There is a class of warning which:
                   #  1) Android always enables and also treats as errors
diff --git a/content/content.gyp b/content/content.gyp
index d01e7d7..7afba7c 100644
--- a/content/content.gyp
+++ b/content/content.gyp
@@ -30,7 +30,6 @@
           },
         },
       }],
-      
     ],
   },
   'conditions': [
@@ -322,7 +321,7 @@
             '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',
diff --git a/content/content_shell.gypi b/content/content_shell.gypi
index 9042c5c..28404e3 100644
--- a/content/content_shell.gypi
+++ b/content/content_shell.gypi
@@ -608,7 +608,7 @@
             'shell/android/shell_library_loader.h',
           ],
           'conditions': [
-            ['android_build_type==1', {
+            ['android_webview_build==1', {
               'ldflags': [
                 '-lgabi++',  # For rtti
               ],
diff --git a/net/net.gyp b/net/net.gyp
index 98b9496..4716497 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -1269,7 +1269,7 @@
             },
           },
         ],
-        ['OS=="android" and _toolset=="target" and android_build_type == 0', {
+        ['OS=="android" and _toolset=="target" and android_webview_build == 0', {
           'dependencies': [
              'net_java',
           ],
diff --git a/skia/skia.gyp b/skia/skia.gyp
index 340e64e0..66531c6 100644
--- a/skia/skia.gyp
+++ b/skia/skia.gyp
@@ -434,7 +434,7 @@
                 'ext/vector_platform_device_skia.cc',
               ],
             }],
-            [ '_toolset == "target" and android_build_type == 0', {
+            [ '_toolset == "target" and android_webview_build == 0', {
               'defines': [
                 'HAVE_ENDIAN_H',
               ],
@@ -597,7 +597,7 @@
               'SK_BUILD_FOR_ANDROID_NDK',
             ],
             'conditions': [
-              [ '_toolset == "target" and android_build_type == 0', {
+              [ '_toolset == "target" and android_webview_build == 0', {
                 'defines': [
                   'HAVE_ENDIAN_H',
                 ],
diff --git a/third_party/eyesfree/eyesfree.gyp b/third_party/eyesfree/eyesfree.gyp
index 6a8501e..f403ec3 100644
--- a/third_party/eyesfree/eyesfree.gyp
+++ b/third_party/eyesfree/eyesfree.gyp
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 {
   'conditions': [
-    ['OS == "android" and android_build_type == 0', {
+    ['OS == "android" and android_webview_build == 0', {
       'targets': [
         {
           'target_name': 'eyesfree_java',
diff --git a/ui/shell_dialogs.gypi b/ui/shell_dialogs.gypi
index 4f474c5..2675d73 100644
--- a/ui/shell_dialogs.gypi
+++ b/ui/shell_dialogs.gypi
@@ -70,7 +70,7 @@
             ],
           },
         }],
-        ['OS=="android" and android_build_type==0', {
+        ['OS=="android" and android_webview_build==0', {
           'dependencies': [
             'ui_java',
           ],
diff --git a/ui/ui.gyp b/ui/ui.gyp
index 6da2e92..4e7a9b3 100644
--- a/ui/ui.gyp
+++ b/ui/ui.gyp
@@ -823,7 +823,7 @@
             ],
           },
         }],
-        ['OS=="android" and android_build_type==0', {
+        ['OS=="android" and android_webview_build==0', {
           'dependencies': [
             'ui_java',
           ],