Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(231)

Unified Diff: tools/android/md5sum/BUILD.gn

Issue 1233313003: GN (android): Fix md5sum_bin_host not working for component builds (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: improve comment Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/symlink.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/android/md5sum/BUILD.gn
diff --git a/tools/android/md5sum/BUILD.gn b/tools/android/md5sum/BUILD.gn
index 0f520401eedff38691926eacdc78a62ab39bafd1..0740cab610d5fc20df24c674d353a3b0d1b77f71 100644
--- a/tools/android/md5sum/BUILD.gn
+++ b/tools/android/md5sum/BUILD.gn
@@ -5,8 +5,6 @@
# GYP: //tools/android/md5sum/md5sum.gyp:md5sum
group("md5sum") {
datadeps = [
- ":md5sum_bin($host_toolchain)",
- ":md5sum_bin($default_toolchain)",
":md5sum_prepare_dist($default_toolchain)",
":md5sum_copy_host($host_toolchain)",
]
@@ -45,15 +43,25 @@ if (current_toolchain == default_toolchain) {
}
} else {
# GYP: //tools/android/md5sum/md5sum.gyp:md5sum_bin_host
- copy("md5sum_copy_host") {
+ action("md5sum_copy_host") {
+ # Symlink rather than copy. When copied and using a component build, it
+ # fails to find libbase.so (since it's actually at clang_x64/libbase.so).
+ script = "//build/symlink.py"
+ _src = "$root_out_dir/md5sum_bin"
+ _target = "$root_build_dir/md5sum_bin_host"
sources = [
- "$root_out_dir/md5sum_bin",
+ _src,
]
outputs = [
- "$root_build_dir/md5sum_bin_host",
+ _target,
]
deps = [
":md5sum_bin",
]
+ args = [
+ "-f",
+ rebase_path(_src, root_build_dir),
+ rebase_path(_target, root_build_dir),
+ ]
}
}
« no previous file with comments | « build/symlink.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698