Change FileArg syntax

build/config/android/internal_rules.gni

 # Copyright 2014 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("//build/config/android/config.gni")
 
 assert(is_android)
 
 
 rebased_android_sdk = rebase_path(android_sdk, root_build_dir)
 rebased_android_sdk_root = rebase_path(android_sdk_root, root_build_dir)
 rebased_android_sdk_build_tools = rebase_path(android_sdk_build_tools, root_build_dir)
 
 
 # Write the target's .build_config file. This is a json file that contains a
 # dictionary of information about how to build this target (things that
 # require knowledge about this target's dependencies and cannot be calculated
 # at gn-time). There is a special syntax to add a value in that dictionary to
 # an action/action_foreachs args:
-#   --python-arg=@($rebased_build_config_path:key0:key1)
+#   --python-arg=@FileArg($rebased_build_config_path:key0:key1)
 # At runtime, such an arg will be replaced by the value in the build_config.
 # See build/android/gyp/write_build_config.py and
 # build/android/gyp/util/build_utils.py:ExpandFileArgs
 template("write_build_config") {
   assert(defined(invoker.type))
   assert(defined(invoker.base_path))
 
   base_path = invoker.base_path
   type = invoker.type
   build_config = base_path + ".build_config"
@@ skipping 144 matching lines @@
     sources = java_files + java_srcjars
     inputs = system_jars + [ build_config ]
 
     rebase_system_jars = rebase_path(system_jars, root_build_dir)
     rebase_java_srcjars = rebase_path(java_srcjars, root_build_dir)
     rebase_build_config = rebase_path(build_config, root_build_dir)
     rebase_depfile = rebase_path(depfile, root_build_dir)
     args = [
       "--depfile=$rebase_depfile",
       "--classpath=$rebase_system_jars",
-      "--classpath=@($rebase_build_config:javac:classpath)",
+      "--classpath=@FileArg($rebase_build_config:javac:classpath)",
       "--jar-path=$rebase_jar_path",
       "--java-srcjars=$rebase_java_srcjars",
-      "--java-srcjars=@($rebase_build_config:javac:srcjars)",
+      "--java-srcjars=@FileArg($rebase_build_config:javac:srcjars)",
       "--jar-excluded-classes=$jar_excluded_patterns",
     ]
     if (chromium_code) {
       args += [ "--chromium-code" ]
     }
 
     args += rebase_path(java_files, root_build_dir)
   }
 
   # TODO(cjhopman): proguard
@@ skipping 94 matching lines @@
       "--depfile", rebase_path(depfile, root_build_dir),
       "--android-sdk", rebase_path(android_sdk, root_build_dir),
       "--android-sdk-tools", rebase_path(android_sdk_build_tools, root_build_dir),
       "--non-constant-id",
       "--android-manifest", rebase_path(android_manifest, root_build_dir),
 
       "--resource-dirs=$rebase_resource_dirs",
       "--srcjar-out", rebase_path(srcjar_path, root_build_dir),
       "--resource-zip-out", rebase_path(zip_path, root_build_dir),
 
-      "--dependencies-res-zips=@($rebase_build_config:resources:dependency_zips)",
+      "--dependencies-res-zips=@FileArg($rebase_build_config:resources:dependency_zips)",
     ]
 
     if (defined(invoker.custom_package)) {
       args += [
         "--custom-package", invoker.custom_package,
       ]
     }
 
     if (defined(invoker.v14_verify_only) && invoker.v14_verify_only) {
       args += ["--v14-verify-only"]
     }
   }
 }