Commit 6cd77121 authored by John Budorick's avatar John Budorick Committed by Commit Bot

Revert "Remove absolute paths from build files"

This reverts commit 8dbc0c82.

Reason for revert: broke https://ci.chromium.org/buildbot/chromium.chrome/Google%20Chrome%20Linux%20x64/32416

Original change's description:
> Remove absolute paths from build files
> 
> This CL removes all absolute paths to src and all usages of the out directory
> name from all ninja files on most Linux builds.
> 
> This means it's possible to mount your src directory at different locations and
> still have incremental builds work.  You can also rename your out directory.
> 
> BUG=None
> R=​dpranke,caitkp,rockot
> 
> Change-Id: I5ff5b0d2d60110755dde64e876c7f1a09d814b1a
> Reviewed-on: https://chromium-review.googlesource.com/1091457
> Reviewed-by: Cait Phillips <caitkp@chromium.org>
> Reviewed-by: Ken Rockot <rockot@chromium.org>
> Reviewed-by: Dirk Pranke <dpranke@chromium.org>
> Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#567020}

TBR=caitkp@chromium.org,rockot@chromium.org,dpranke@chromium.org,thomasanderson@chromium.org

Change-Id: Iec959adc2e8c82dd191f382c0cfb197aea406fc3
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: None
Reviewed-on: https://chromium-review.googlesource.com/1099979Reviewed-by: default avatarJohn Budorick <jbudorick@chromium.org>
Commit-Queue: John Budorick <jbudorick@chromium.org>
Cr-Commit-Position: refs/heads/master@{#567038}
parent e29a31ae
......@@ -511,8 +511,8 @@ config("compiler") {
# clang-cl (used if is_win) doesn't expose this flag.
# Currently disabled for nacl since its toolchain lacks this flag (too old).
# TODO(zforman): Once nacl's toolchain is updated, remove check.
if (symbol_level != 0 && is_clang && !is_nacl && !is_win && !is_mac &&
!is_ios && strip_absolute_paths_from_debug_symbols) {
if (is_clang && !is_nacl && !is_win && !is_mac && !is_ios &&
strip_absolute_paths_from_debug_symbols) {
# This is resolved to path like "$HOME/chromium/src/out/Release".
# If debug option is given, clang includes $cwd in debug info.
# In such build, this flag generates reproducible obj files
......@@ -2048,8 +2048,7 @@ if (is_clang && current_toolchain == default_toolchain) {
"Our default profiles currently only apply to Chromium")
assert(is_android || is_desktop_linux,
"The current platform has no default profile")
_clang_sample_profile =
rebase_path("//chrome/android/profiles/afdo.prof", root_build_dir)
_clang_sample_profile = rebase_path("//chrome/android/profiles/afdo.prof")
}
}
......
......@@ -46,7 +46,7 @@ template("generate_expired_histograms_array") {
"-o" + rebase_path(root_gen_dir, root_build_dir),
"-H" + rebase_path(header_filename, root_gen_dir),
"-d" + rebase_path(major_branch_date_filepath, root_build_dir),
"-m" + rebase_path(milestone_filepath, root_build_dir),
"-m" + rebase_path(milestone_filepath),
] + rebase_path(inputs, root_build_dir)
}
}
......@@ -100,14 +100,18 @@ if (!is_ios) {
]
inputs = [
# Make sure the inputs are system-absolute, as base::File cannot open files with ".." components.
rebase_path(
"//components/subresource_filter/core/common/perftests/data/UnindexedRules_7.54",
"",
"/"),
]
deps = [
":subresource_indexing_tool",
]
args = [
rebase_path(inputs[0], root_build_dir),
inputs[0],
rebase_path("$target_gen_dir/GeneratedRulesetData", root_build_dir),
]
}
......
......@@ -23,7 +23,7 @@ bool IndexAndWriteRuleset(const base::FilePath& unindexed_path,
return false;
}
base::File unindexed_file(base::MakeAbsoluteFilePath(unindexed_path),
base::File unindexed_file(unindexed_path,
base::File::FLAG_OPEN | base::File::FLAG_READ);
subresource_filter::RulesetIndexer indexer;
......
......@@ -268,9 +268,8 @@ if (is_chromeos || is_linux || is_android) {
}
config("export_only_thunks_api") {
ldflags =
[ "-Wl,--version-script=" +
rebase_path("//mojo/edk/export_only_thunks_api.lst", root_build_dir) ]
ldflags = [ "-Wl,--version-script=" +
rebase_path("//mojo/edk/export_only_thunks_api.lst") ]
}
if (is_chromeos || is_linux) {
......
......@@ -471,6 +471,7 @@ fuzzer_test("javascript_parser_proto_fuzzer") {
"//v8:v8",
"//v8:v8_libplatform",
]
include_dirs = [ "$root_build_dir/$target_gen_dir" ]
}
fuzzer_test("v8_fully_instrumented_fuzzer") {
......
......@@ -636,7 +636,7 @@ grit("resources") {
html_min_css = "$blink_core_output_dir/html.css"
grit_flags = [
"-E",
"html_min_css=" + rebase_path(html_min_css, root_build_dir),
"html_min_css=" + rebase_path(html_min_css, "."),
]
deps = [
"//third_party/blink/renderer/core:make_minimized_css",
......
......@@ -9,7 +9,7 @@
<release seq="1">
<includes>
<!-- Source/core/css/html.css processed through minimize_css.py -->
<include name="IDR_UASTYLE_HTML_CSS" file="${cwd}/${html_min_css}" type="BINDATA" compress="gzip"/>
<include name="IDR_UASTYLE_HTML_CSS" file="${html_min_css}" type="BINDATA" compress="gzip"/>
<include name="IDR_UASTYLE_QUIRKS_CSS" file="../renderer/core/css/quirks.css" type="BINDATA" compress="gzip"/>
<include name="IDR_UASTYLE_VIEW_SOURCE_CSS" file="../renderer/core/css/view-source.css" type="BINDATA" compress="gzip"/>
<include name="IDR_UASTYLE_THEME_CHROMIUM_ANDROID_CSS" file="../renderer/core/css/themeChromiumAndroid.css" type="BINDATA" compress="gzip"/>
......
......@@ -148,7 +148,6 @@ are exported to translation interchange files (e.g. XMB files), etc.
return 'A tool that builds RC files for compilation.'
def Run(self, opts, args):
os.environ['cwd'] = os.getcwd()
self.output_directory = '.'
first_ids_file = None
predetermined_ids_file = None
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment