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

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

Issue 1903623002: [Mac/GN] Get //ppapi tests and examples working. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@gn-framework-content
Patch Set: Created 4 years, 8 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 | ppapi/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/config/mac/rules.gni
diff --git a/build/config/mac/rules.gni b/build/config/mac/rules.gni
index f0c2c5d210d6eb46a93041aac2fff61e984bc804..b6b70c1bec16098135d82abab320c61ac97e5bbc 100644
--- a/build/config/mac/rules.gni
+++ b/build/config/mac/rules.gni
@@ -428,6 +428,11 @@ template("mac_plugin_bundle") {
_loadable_module_target = _target_name + "_loadable_module"
_loadable_module_bundle_data = _loadable_module_target + "_bundle_data"
+ _output_name = _target_name
+ if (defined(invoker.output_name)) {
+ _output_name = invoker.output_name
+ }
+
loadable_module(_loadable_module_target) {
visibility = [ ":$_loadable_module_bundle_data" ]
forward_variables_from(invoker,
@@ -438,15 +443,18 @@ template("mac_plugin_bundle") {
"output_name",
"visibility",
])
+ output_dir = "$target_out_dir"
+ output_name = _output_name
}
bundle_data(_loadable_module_bundle_data) {
+ forward_variables_from(invoker, [ "testonly" ])
visibility = [ ":$_target_name" ]
sources = [
- "$root_out_dir/${_loadable_module_target}.so",
+ "$target_out_dir/${_output_name}.so",
]
outputs = [
- "{{bundle_executable_dir}}/$_target_name",
+ "{{bundle_executable_dir}}/$_output_name",
]
public_deps = [
":$_loadable_module_target",
@@ -467,7 +475,7 @@ template("mac_plugin_bundle") {
}
deps += [ ":$_loadable_module_bundle_data" ]
- bundle_root_dir = "$root_out_dir/$_target_name.plugin/Contents"
+ bundle_root_dir = "$root_out_dir/$_output_name.plugin/Contents"
bundle_executable_dir = "$bundle_root_dir/MacOS"
}
}
« no previous file with comments | « no previous file | ppapi/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698