From 9e4c78fb5752fa554db82815f7336255831a95ab Mon Sep 17 00:00:00 2001 From: Damien Martin-Guillerez Date: Fri, 22 Apr 2016 11:42:34 +0000 Subject: Automated [] rollback of commit 857cda2c45a5cc68c3fa398311c48c571a64915d and commit 790d2f6009d47fe92cf0cd92a1473bbf0141f32e. *** Reason for rollback *** Broke non-Bazel projects on ci.bazel.io Fixes #1168 *** Original change description *** Move the runfiles for external repositories to under the x.runfiles/ directory This also sets the Bazel workspace name to io_bazel_source. Fixes #848. Relevant to #1116, #1124, RELNOTES[INC]: All repositories are now directly under the x.runfiles directory in the runfiles tree (previously, external repositories were at x.runfiles/main-repo/external/other-repo. This simplifies handling remote repository runfiles considerably, but will break existing references to external repository runfiles.... *** -- MOS_MIGRATED_REVID=120535721 --- examples/java-skylark/src/main/java/com/example/myproject/Greeter.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'examples/java-skylark') diff --git a/examples/java-skylark/src/main/java/com/example/myproject/Greeter.java b/examples/java-skylark/src/main/java/com/example/myproject/Greeter.java index 143a71dfd4..b4d8516dc9 100644 --- a/examples/java-skylark/src/main/java/com/example/myproject/Greeter.java +++ b/examples/java-skylark/src/main/java/com/example/myproject/Greeter.java @@ -29,8 +29,7 @@ public class Greeter { public void hello(String obj) throws Exception { String greeting = "Hello"; try { - String greetFile = getRunfiles() - + "/io_bazel/examples/java-skylark/src/main/resources/greeting.txt"; + String greetFile = getRunfiles() + "/examples/java-skylark/src/main/resources/greeting.txt"; greeting = convertStreamToString(new FileInputStream(greetFile)); } catch (FileNotFoundException e) { // use default. -- cgit v1.2.3