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

Unified Diff: tools/gn/bundle_data.cc

Issue 2101923006: Fix BundleData::GetBundleRootDirOutput() for non-default toolchain. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@create-bundle-deps
Patch Set: Rebase. Created 4 years, 6 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 | « no previous file | tools/gn/function_rebase_path_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/gn/bundle_data.cc
diff --git a/tools/gn/bundle_data.cc b/tools/gn/bundle_data.cc
index 2908ddf4d43562b7a16d4f2478891a137d467059..448eac96b425f52bb54e952ebda1438e32567699 100644
--- a/tools/gn/bundle_data.cc
+++ b/tools/gn/bundle_data.cc
@@ -148,7 +148,7 @@ SourceFile BundleData::GetCompiledAssetCatalogPath() const {
}
SourceFile BundleData::GetBundleRootDirOutput(const Settings* settings) const {
- const SourceDir& build_dir = settings->build_settings()->build_dir();
+ const SourceDir& build_dir = settings->toolchain_output_dir();
std::string bundle_root_relative = RebasePath(root_dir().value(), build_dir);
size_t first_component = bundle_root_relative.find('/');
« no previous file with comments | « no previous file | tools/gn/function_rebase_path_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698