Relativize paths in build files

BUG=871574

Change-Id: I8eca9b8fabf1e90b0e9c054dd5283be21508bae4
Reviewed-on: https://chromium-review.googlesource.com/1164536Reviewed-by: Johann Koenig <johannkoenig@google.com>
Reviewed-by: Scott Violet <sky@chromium.org>
Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
Cr-Commit-Position: refs/heads/master@{#582764}

android_webview/BUILD.gn

@@ -269,9 +269,9 @@ grit("generate_webui_resources") {
 
   # webui/resources has way too many resources. The whitelist is trim this down
   # to a reasonable size
-  whitelist = rebase_path("ui/grit_resources_whitelist.txt")
+  whitelist = rebase_path("ui/grit_resources_whitelist.txt", root_build_dir)
   inputs = [
-    whitelist,
+    "//android_webview/ui/grit_resources_whitelist.txt",
   ]
   grit_flags = [
     "-w",
@@ -292,9 +292,9 @@ grit("generate_components_resources") {
   source_is_generated = true
 
   # See :generate_webui_resources for an explanation of the whitelist
-  whitelist = rebase_path("ui/grit_resources_whitelist.txt")
+  whitelist = rebase_path("ui/grit_resources_whitelist.txt", root_build_dir)
   inputs = [
-    whitelist,
+    "//android_webview/ui/grit_resources_whitelist.txt",
   ]
   grit_flags = [
     "-w",
@@ -317,9 +317,9 @@ grit("generate_components_strings") {
   # will never display most of them, so we try to limit the included
   # strings. This whitelist trims about 50% more than the compile-based
   # whitelist generated by :system_webview_pak_whitelist.
-  whitelist = rebase_path("ui/grit_strings_whitelist.txt")
+  whitelist = rebase_path("ui/grit_strings_whitelist.txt", root_build_dir)
   inputs = [
-    whitelist,
+    "//android_webview/ui/grit_strings_whitelist.txt",
   ]
   grit_flags = [
     "-w",

android_webview/glue/generate_resource_rewriter.gni

@@ -39,14 +39,14 @@ template("generate_resource_rewriter") {
     deps = invoker.deps + [ ":${_build_config_target_name}" ]
     script = "//build/android/gyp/generate_resource_rewriter.py"
 
-    _rebased_build_config = rebase_path(_build_config)
+    _rebased_build_config = rebase_path(_build_config, root_build_dir)
     args = [
       "--package-name",
       invoker.package_name,
       "--dep-packages",
       "@FileArg($_rebased_build_config:resources:extra_package_names)",
       "--srcjar",
-      rebase_path(_srcjar),
+      rebase_path(_srcjar, root_build_dir),
     ]
     outputs = [
       _srcjar,

build/config/android/BUILD.gn

@@ -189,12 +189,14 @@ config("executable_config") {
 
 config("hide_all_but_jni_onload") {
   ldflags = [ "-Wl,--version-script=" + rebase_path(
-                  "//build/android/android_only_explicit_jni_exports.lst") ]
+                  "//build/android/android_only_explicit_jni_exports.lst",
+                  root_build_dir) ]
 }
 
 config("hide_all_but_jni") {
   ldflags = [ "-Wl,--version-script=" +
-              rebase_path("//build/android/android_only_jni_exports.lst") ]
+              rebase_path("//build/android/android_only_jni_exports.lst",
+                          root_build_dir) ]
 }
 
 config("lld_pack_relocations") {

build/config/android/rules.gni

@@ -1822,7 +1822,8 @@ if (enable_java_templates) {
         inputs = [
           invoker.build_config,
         ]
-        _rebased_build_config = rebase_path(invoker.build_config)
+        _rebased_build_config =
+            rebase_path(invoker.build_config, root_build_dir)
         defines += [
           "COMPRESSED_LOCALE_LIST=" +
               "@FileArg($_rebased_build_config:compressed_locales_java_list)",

chrome/browser/chromeos/BUILD.gn

@@ -2396,12 +2396,12 @@ action("device_policy_remover_generate") {
 
   args = [
     # generated file name
-    rebase_path(device_policy_remover_path),
+    rebase_path(device_policy_remover_path, root_build_dir),
 
     # directories for PATH variable to compile generated file
-    rebase_path(descriptor_pool_path),
-    rebase_path(symbol_database_path),
-    rebase_path(chrome_device_policy_pb2_path),
+    rebase_path(descriptor_pool_path, root_build_dir),
+    rebase_path(symbol_database_path, root_build_dir),
+    rebase_path(chrome_device_policy_pb2_path, root_build_dir),
   ]
 
   public_deps = [

chrome/chrome_cleaner/test/resources/BUILD.gn

@@ -46,7 +46,7 @@ grit("test_resources") {
 
   grit_flags = [
     "-E",
-    "generated_resources_dir=" + rebase_path(target_gen_dir),
+    "generated_resources_dir=" + rebase_path(target_gen_dir, root_build_dir),
   ]
 
   deps = [

chromecast/build/tests/cast_test.gni

@@ -236,7 +236,7 @@ template("cast_test_group") {
 
     args = [
       "-o",
-      rebase_path("$_output_prefix.tests"),
+      rebase_path("$_output_prefix.tests", root_build_dir),
       "create_list",
     ]
 
@@ -262,7 +262,7 @@ template("cast_test_group") {
 
     args = [
       "-o",
-      rebase_path("$_output_prefix.filters"),
+      rebase_path("$_output_prefix.filters", root_build_dir),
       "create_list",
     ]
 
@@ -395,9 +395,9 @@ template("cast_test_group_list") {
 
     args = [
       "-o",
-      rebase_path(invoker.build_list_path),
+      rebase_path(invoker.build_list_path, root_build_dir),
       "-t",
-      rebase_path(_shared_dir),
+      rebase_path(_shared_dir, root_build_dir),
       "pack_build",
     ]
 
@@ -422,11 +422,11 @@ template("cast_test_group_list") {
 
     args = [
       "-o",
-      rebase_path(invoker.run_list_path),
+      rebase_path(invoker.run_list_path, root_build_dir),
       "-d",
-      rebase_path(invoker.runtime_deps_path),
+      rebase_path(invoker.runtime_deps_path, root_build_dir),
       "-t",
-      rebase_path(_shared_dir),
+      rebase_path(_shared_dir, root_build_dir),
       "pack_run",
     ]
 

chromeos/ime/BUILD.gn

@@ -11,7 +11,7 @@ action("gencode") {
     "$target_gen_dir/input_methods.h",
   ]
   args = [
-    rebase_path("//chromeos/ime/input_methods.txt"),
-    rebase_path("$target_gen_dir/input_methods.h"),
+    rebase_path("//chromeos/ime/input_methods.txt", root_build_dir),
+    rebase_path("$target_gen_dir/input_methods.h", root_build_dir),
   ]
 }

components/url_formatter/top_domains/BUILD.gn

@@ -47,9 +47,7 @@ compiled_action("generate_top_domains_trie") {
     "$target_gen_dir/alexa_domains-trie-inc.cc",
   ]
   args =
-      # Make sure the inputs are system-absolute, as base::File cannot open
-      # files with ".." components.
-      rebase_path(inputs, "", "/") + rebase_path(outputs, root_build_dir)
+      rebase_path(inputs, root_build_dir) + rebase_path(outputs, root_build_dir)
 }
 
 # TODO: Combine this and the previous one into a compiled_action_foreach target.
@@ -65,7 +63,5 @@ compiled_action("generate_top_domains_test_trie") {
     "$target_gen_dir/test_domains-trie-inc.cc",
   ]
   args =
-      # Make sure the inputs are system-absolute, as base::File cannot open
-      # files with ".." components.
-      rebase_path(inputs, "", "/") + rebase_path(outputs, root_build_dir)
+      rebase_path(inputs, root_build_dir) + rebase_path(outputs, root_build_dir)
 }

components/url_formatter/top_domains/top_domain_generator.cc

@@ -71,7 +71,8 @@ int main(int argc, char* argv[]) {
     return 1;
   }
 
-  base::FilePath input_path = base::FilePath::FromUTF8Unsafe(argv[1]);
+  base::FilePath input_path =
+      base::MakeAbsoluteFilePath(base::FilePath::FromUTF8Unsafe(argv[1]));
   if (!base::PathExists(input_path)) {
     LOG(ERROR) << "Input path doesn't exist: " << input_path;
     return 1;
@@ -146,4 +147,4 @@ int main(int argc, char* argv[]) {
   }
 
   return 0;
-}
\ No newline at end of file
+}

remoting/credits/credits.gni

@@ -38,7 +38,7 @@ template("remoting_credits") {
       "--gn-target",
       invoker.gn_target,
       "--gn-out-dir",
-      rebase_path(root_build_dir),
+      ".",
     ]
   }
 

remoting/host/installer/win/BUILD.gn

@@ -71,7 +71,8 @@ action("remoting_me2me_host_archive") {
   ]
 
   _generated_files = rebase_path(inputs, root_build_dir)
-  _generated_files += [ rebase_path("//remoting/resources/chromoting.ico") ]
+  _generated_files +=
+      [ rebase_path("//remoting/resources/chromoting.ico", root_build_dir) ]
 
   # _generated_dst_files must contain the same files in the same order as
   # _generated_files, otherwise the Windows MSI will not be built correctly.
@@ -95,10 +96,12 @@ action("remoting_me2me_host_archive") {
            rebase_path("$root_gen_dir/remoting_installation", root_build_dir),
            rebase_path(_output, root_build_dir),
            "--source-file-roots",
-           rebase_path("//remoting/host/installer/win"),
+           rebase_path("//remoting/host/installer/win", root_build_dir),
            "--source-files",
-           rebase_path("//remoting/host/installer/win/chromoting.wxs"),
-           rebase_path("//remoting/host/installer/win/parameters.json"),
+           rebase_path("//remoting/host/installer/win/chromoting.wxs",
+                       root_build_dir),
+           rebase_path("//remoting/host/installer/win/parameters.json",
+                       root_build_dir),
 
            # Input files
            "--generated-files",
@@ -133,7 +136,7 @@ if (is_chrome_branded && !is_component_build && target_cpu == "x86") {
     ]
     args = [
       "--wix_path",
-      rebase_path("//third_party/wix"),
+      rebase_path("//third_party/wix", root_build_dir),
       "--intermediate_dir",
       rebase_path("$root_gen_dir/remoting_installation", root_build_dir),
       "--target_arch",

testing/libfuzzer/fuzzer_test.gni

@@ -178,6 +178,10 @@ template("fuzzer_test") {
         configs -= invoker.suppressed_configs
       }
 
+      if (defined(invoker.generated_sources)) {
+        sources += invoker.generated_sources
+      }
+
       if (is_mac) {
         sources += [ "//testing/libfuzzer/libfuzzer_exports.h" ]
       }

testing/libfuzzer/fuzzers/BUILD.gn

@@ -459,8 +459,8 @@ proto_library("javascript_parser_proto") {
 }
 
 fuzzer_test("javascript_parser_proto_fuzzer") {
+  generated_sources = [ "$target_gen_dir/javascript_parser_proto_to_string.cc" ]
   sources = [
-    "$target_gen_dir/javascript_parser_proto_to_string.cc",
     "javascript_parser_proto_fuzzer.cc",
     "javascript_parser_proto_to_string.h",
   ]

third_party/libvpx/BUILD.gn

@@ -274,7 +274,7 @@ if (current_cpu == "arm" && arm_assembly_sources != []) {
       "-i",
       "{{source}}",
       "-o",
-      rebase_path(gen_file),
+      rebase_path(gen_file, root_build_dir),
     ]
   }
 

third_party/mockito/BUILD.gn

@@ -475,7 +475,8 @@ android_library("mockito_android_java") {
   include_java_resources = true
   additional_jar_files = [ [
         rebase_path(
-            "src/subprojects/android/src/main/resources/mockito-extensions/org.mockito.plugins.MockMaker"),
+            "src/subprojects/android/src/main/resources/mockito-extensions/org.mockito.plugins.MockMaker",
+            root_build_dir),
         "mockito-extensions/org.mockito.plugins.MockMaker",
       ] ]
 }

third_party/robolectric/BUILD.gn

@@ -116,7 +116,8 @@ java_library("robolectric_java") {
   ]
   additional_jar_files = [ [
         rebase_path(
-            "local/robolectric/src/main/resources/robolectric-version.properties"),
+            "local/robolectric/src/main/resources/robolectric-version.properties",
+            root_build_dir),
         "robolectric-version.properties",
       ] ]
 
@@ -366,29 +367,34 @@ java_library("shadows_core_java") {
   if (host_os == "linux") {
     additional_jar_files = [
       [
-        rebase_path("../sqlite4java/lib/linux-x86_64/libsqlite4java.so"),
+        rebase_path("../sqlite4java/lib/linux-x86_64/libsqlite4java.so",
+                    root_build_dir),
         "linux-x86_64/libsqlite4java.so",
       ],
       [
-        rebase_path("../sqlite4java/lib/linux-x86/libsqlite4java.so"),
+        rebase_path("../sqlite4java/lib/linux-x86/libsqlite4java.so",
+                    root_build_dir),
         "linux-x86/libsqlite4java.so",
       ],
     ]
   }
   if (host_os == "mac") {
     additional_jar_files = [ [
-          rebase_path("../sqlite4java/lib/mac-x86_64/libsqlite4java.jnilib"),
+          rebase_path("../sqlite4java/lib/mac-x86_64/libsqlite4java.jnilib",
+                      root_build_dir),
           "mac-x86_64/libsqlite4java.jnilib",
         ] ]
   }
   if (host_os == "win") {
     additional_jar_files = [
       [
-        rebase_path("../sqlite4java/lib/windows-x86/sqlite4java.dll"),
+        rebase_path("../sqlite4java/lib/windows-x86/sqlite4java.dll",
+                    root_build_dir),
         "windows-x86/sqlite4java.dll",
       ],
       [
-        rebase_path("../sqlite4java/lib/windows-x86_64/sqlite4java.dll"),
+        rebase_path("../sqlite4java/lib/windows-x86_64/sqlite4java.dll",
+                    root_build_dir),
         "windows-x86_64/sqlite4java.dll",
       ],
     ]

tools/grit/grit_rule.gni

@@ -384,7 +384,7 @@ template("grit") {
       }
     }
     if (_strip_resource_files) {
-      js_minifier_command = rebase_path(_js_minifier)
+      js_minifier_command = rebase_path(_js_minifier, root_build_dir)
       js_minifier_command = "$js_minifier_command --closure_args"
       foreach(closure_arg,
               common_closure_args + minifying_closure_args +