From e45a363cf7c2abfdf1dd67cfb7ed0a54d1ed52c2 Mon Sep 17 00:00:00 2001 From: Googler Date: Fri, 30 Oct 2015 21:33:31 +0000 Subject: Pass StdRedirect.dylib to ios_runner.sh.mac_template. So that we could use "xcrun simctl" instead of iossim to launch the app when we invoke "blaze run". The next CL is to use it in ios_runner.sh.mac_template after new bazle is released. -- MOS_MIGRATED_REVID=106725049 --- .../devtools/build/lib/rules/objc/ReleaseBundlingSupport.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'src/main/java') diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ReleaseBundlingSupport.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ReleaseBundlingSupport.java index 09dd16ea81..f11ec3f30b 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/ReleaseBundlingSupport.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ReleaseBundlingSupport.java @@ -430,7 +430,9 @@ public final class ReleaseBundlingSupport { Substitution.of("%ipa_file%", ipaInput.getRootRelativePath().getPathString()), Substitution.of("%sim_device%", escapedSimDevice), Substitution.of("%sdk_version%", escapedSdkVersion), - Substitution.of("%iossim%", attributes.iossim().getRootRelativePath().getPathString())); + Substitution.of("%iossim%", attributes.iossim().getRootRelativePath().getPathString()), + Substitution.of("%std_redirect_dylib_path%", + attributes.stdRedirectDylib().getRootRelativePath().getPathString())); ruleContext.registerAction( new TemplateExpansionAction(ruleContext.getActionOwner(), attributes.runnerScriptTemplate(), @@ -866,6 +868,10 @@ public final class ReleaseBundlingSupport { return checkNotNull(ruleContext.getPrerequisiteArtifact("$iossim", Mode.HOST)); } + Artifact stdRedirectDylib() { + return checkNotNull(ruleContext.getPrerequisiteArtifact("$std_redirect_dylib", Mode.HOST)); + } + Artifact runnerScriptTemplate() { return checkNotNull( ruleContext.getPrerequisiteArtifact("$runner_script_template", Mode.HOST)); -- cgit v1.2.3