diff options
| author |  Yun Peng <pcloudy@google.com> | 2016-07-04 15:18:12 +0000 |
|---|---|---|
| committer |  Klaus Aehlig <aehlig@google.com> | 2016-07-05 10:27:05 +0000 |
| commit | 66d8dd8baf1d1de4834f327e05a1deddae5c7b94 (patch) | |
| tree | 04c5a1394d8e3c03071bc3870309f1891c8de7b6 /src/main/java/com | |
| parent | 4017d28739dda440dd6349acd8093264fd10b04f (diff) | |
Fixed java_stub_template.txt so that java binary can run independently
The solution is setting RUNFILES_MANIFEST_ONLY=1 in template file
if only runfile manifest feature is enabled.
--
Change-Id: I6c96cc1212818bd57adcdfb59fa0de66d2d38037
Reviewed-on: https://bazel-review.googlesource.com/#/c/3960
MOS_MIGRATED_REVID=126577520
Diffstat (limited to 'src/main/java/com')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaSemantics.java | 4 | ||||
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/bazel/rules/java/java_stub_template.txt | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaSemantics.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaSemantics.java index e7a54c14ee..e5fe3477d6 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaSemantics.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaSemantics.java @@ -169,7 +169,9 @@ public class BazelJavaSemantics implements JavaSemantics { String workspaceName = ruleContext.getWorkspaceName(); final String workspacePrefix = workspaceName + (workspaceName.isEmpty() ? "" : "/"); final boolean isRunfilesEnabled = ruleContext.getConfiguration().runfilesEnabled(); - + if (!isRunfilesEnabled) { + arguments.add(Substitution.of("%runfiles_manifest_only%", "1")); + } arguments.add(Substitution.of("%workspace_prefix%", workspacePrefix)); arguments.add(Substitution.of("%javabin%", javaExecutable)); arguments.add(Substitution.of("%needs_runfiles%", diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/java_stub_template.txt b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/java_stub_template.txt index 517c1d9654..f77051fb2c 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/java_stub_template.txt +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/java_stub_template.txt @@ -166,6 +166,7 @@ if is_windows; then fi RUNFILES_MANIFEST_FILE="${JAVA_RUNFILES}/MANIFEST" +RUNFILES_MANIFEST_ONLY=%runfiles_manifest_only% if [ -z "$RUNFILES_MANIFEST_ONLY" ]; then function rlocation() { |