Use an integer for android_sdk_version.

Bug: 850652
Change-Id: I5493037339fb7675aa942893c5e9654c653b071a
Reviewed-on: https://chromium-review.googlesource.com/1106483
Commit-Queue: John Budorick <jbudorick@chromium.org>
Reviewed-by: agrieve <agrieve@chromium.org>
Reviewed-by: Nate Fischer <ntfschr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#569632}

build/config/android/config.gni

@@ -78,7 +78,7 @@ if (is_android || is_chromeos) {
 
   if (android_sdk_release == "o_mr1") {
     default_android_sdk_root = "//third_party/android_tools/sdk"
-    default_android_sdk_version = "27"
+    default_android_sdk_version = 27
     default_android_sdk_build_tools_version = "27.0.3"
     default_android_sdk_tools_version_suffix = "-26.0.0-dev"
     public_android_sdk = true
@@ -88,7 +88,7 @@ if (is_android || is_chromeos) {
     # Purposefully repeated so that downstream can change
     # default_android_sdk_root without changing lint version.
     default_lint_android_sdk_root = "//third_party/android_tools/sdk"
-    default_lint_android_sdk_version = "26"
+    default_lint_android_sdk_version = 26
   }
 
   if (!defined(default_extras_android_sdk_root)) {

tools/android/sdk_updater/update_sdk.py

@@ -179,7 +179,7 @@ def _ReplaceVersionInFile(file_path, pattern, version, dry_run=False):
   with tempfile.NamedTemporaryFile() as temp_file:
     with open(file_path) as f:
       for line in f:
-        new_line = re.sub(pattern, r'\g<1>"%s"\n' % version, line)
+        new_line = re.sub(pattern, r'\g<1>\g<2>%s\g<3>\n' % version, line)
         if new_line != line:
           print ('    Note: file "%s" argument ' % file_path  +
                 '"%s" would be updated to "%s".' % (line.strip(), version))
@@ -299,8 +299,12 @@ def ChangeVersionInGNI(package, arg_version, gn_args_dict, gni_file_path,
     gn_arg_pattern = re.compile(
         # Match the argument with '=' and whitespaces. Capture a group for it.
         r'(^\s*%s\s*=\s*)' % version_config_name +
-        # version number with double quote. E.g. "27", "27.0.3", "-26.0.0-dev"
-        r'([-\w\s."]+)'
+        # Optional quote.
+        r'("?)' +
+        # Version number. E.g. 27, 27.0.3, -26.0.0-dev
+        r'(?:[-\w\s.]+)' +
+        # Optional quote.
+        r'("?)' +
         # End of string
         r'$'
     )

tools/android/sdk_updater/update_sdk_tests.py

+#! /usr/bin/env vpython
+#
+# Copyright 2018 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.
+
+import os
+import shutil
+import tempfile
+import unittest
+
+import update_sdk
+
+class ChangeVersionInGNITests(unittest.TestCase):
+
+  def setUp(self):
+    self._temp_dir = tempfile.mkdtemp()
+    self._gni_file_path = os.path.join(self._temp_dir, 'test_file.gni')
+
+  def tearDown(self):
+    shutil.rmtree(self._temp_dir)
+
+  def testBasic(self):
+    with open(self._gni_file_path, 'w') as gni_file:
+      gni_file.write('sample_gn_version_var = "1.2.3.4"')
+    package = 'sample_package'
+    arg_version = '2.3.4.5'
+    gn_args_dict = {
+      package: 'sample_gn_version_var'
+    }
+    update_sdk.ChangeVersionInGNI(
+        package, arg_version, gn_args_dict, self._gni_file_path, False)
+    with open(self._gni_file_path, 'r') as gni_file:
+      self.assertEquals(
+          'sample_gn_version_var = "2.3.4.5"',
+          gni_file.read().strip())
+
+  def testNoQuotes(self):
+    with open(self._gni_file_path, 'w') as gni_file:
+      gni_file.write('sample_gn_version_var = 1234')
+    package = 'sample_package'
+    arg_version = '2345'
+    gn_args_dict = {
+      package: 'sample_gn_version_var'
+    }
+    update_sdk.ChangeVersionInGNI(
+        package, arg_version, gn_args_dict, self._gni_file_path, False)
+    with open(self._gni_file_path, 'r') as gni_file:
+      self.assertEquals(
+          'sample_gn_version_var = 2345',
+          gni_file.read().strip())
+
+
+if __name__ == '__main__':
+  unittest.main()