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

Unified Diff: build/config/ios/rules.gni

Issue 2109133002: Fix script and compiler invocation when using non-default toolchain. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@{0}
Patch Set: 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 | build/config/mac/base_rules.gni » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/config/ios/rules.gni
diff --git a/build/config/ios/rules.gni b/build/config/ios/rules.gni
index e90efab12e89b9040908c1521b9b3cbde5eaae11..ac2c61ac1c9d98487141d5df7f50bb4d02523114 100644
--- a/build/config/ios/rules.gni
+++ b/build/config/ios/rules.gni
@@ -172,6 +172,8 @@ template("ios_app_bundle") {
])
output_name = rebase_path("$target_gen_dir/$_output_name", root_out_dir)
+ output_prefix_override = true
+
if (!defined(libs)) {
libs = []
}
@@ -448,8 +450,8 @@ template("ios_framework_bundle") {
args = [
rebase_path(_header_map_filename),
- rebase_path(_framework_root, root_out_dir),
- ] + rebase_path(sources, root_out_dir)
+ rebase_path(_framework_root, root_build_dir),
+ ] + rebase_path(sources, root_build_dir)
}
_create_module_map_target = _target_name + "_module_map"
@@ -459,7 +461,7 @@ template("ios_framework_bundle") {
outputs = [
"$_framework_root/Modules/module.modulemap",
]
- args = [ rebase_path("$_framework_root", root_out_dir) ]
+ args = [ rebase_path("$_framework_root", root_build_dir) ]
}
_copy_public_headers_target = _target_name + "_copy_public_headers"
@@ -494,7 +496,7 @@ template("ios_framework_bundle") {
config(_framework_public_config) {
visibility = [ ":$_framework_public_config" ]
if (defined(_public_headers)) {
- common_flags = [ "-F" + rebase_path("$root_out_dir/.", root_out_dir) ]
+ common_flags = [ "-F" + rebase_path("$root_out_dir/.", root_build_dir) ]
cflags_objc = common_flags
cflags_objcc = common_flags
}
« no previous file with comments | « no previous file | build/config/mac/base_rules.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698