Android: Remove build_vars.txt

All usages have now moved to build_vars.json

Bug: 1114750
Change-Id: Ibf6c74fdd24070ba2e32f2c8c43a9b40948d5beb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2424525
Auto-Submit: Andrew Grieve <agrieve@chromium.org>
Commit-Queue: Ben Mason <benmason@chromium.org>
Reviewed-by: Ben Mason <benmason@chromium.org>
Cr-Commit-Position: refs/heads/master@{#810167}

build/android/BUILD.gn

@@ -143,12 +143,3 @@ _build_vars_json = {
 }
 
 write_file(build_vars_file, _build_vars_json, "json")
-
-# TODO(agrieve): Update bot recipes to use .json format.
-if (enable_java_templates) {
-  _lines = [ "final_android_sdk=${_build_vars_json.final_android_sdk}" ]
-  if (defined(_build_vars_json.android_secondary_abi_toolchain)) {
-    _lines += [ "android_secondary_abi_toolchain=${_build_vars_json.android_secondary_abi_toolchain}" ]
-  }
-  write_file("$root_build_dir/build_vars.txt", _lines)
-}

build/android/pylib/constants/host_paths.py

@@ -42,7 +42,7 @@ def SysPath(path, position=None):
 
 
 # Map of CPU architecture name to (toolchain_name, binprefix) pairs.
-# TODO(digit): Use the build_vars.txt file generated by gn.
+# TODO(digit): Use the build_vars.json file generated by gn.
 _TOOL_ARCH_MAP = {
   'arm': ('arm-linux-androideabi-4.9', 'arm-linux-androideabi'),
   'arm64': ('aarch64-linux-android-4.9', 'aarch64-linux-android'),

tools/binary_size/libsupersize/path_util.py

@@ -101,7 +101,7 @@ class ToolPrefixFinder(_PathFinder):
         ret = os.path.join(TOOLS_SRC_ROOT, 'third_party', 'llvm-build',
                            'Release+Asserts', 'bin', 'llvm-')
       else:
-        # Auto-detect from build_vars.txt
+        # Auto-detect from build_vars.json
         build_vars = _LoadBuildVars(output_directory)
         tool_prefix = build_vars.get('android_tool_prefix')
         if tool_prefix:
@@ -110,7 +110,7 @@ class ToolPrefixFinder(_PathFinder):
           if tool_prefix.endswith(os.path.sep):
             ret += os.path.sep
       if ret:
-        # Check for output directories that have a stale build_vars.txt.
+        # Check for output directories that have a stale build_vars.json
         if os.path.isfile(ret + _SAMPLE_TOOL_SUFFIX):
           return ret
         else: