aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/build/lib/skyframe/PackageLookupValue.java
diff options
context:
space:
mode:
authorGravatar John Cater <jcater@google.com>2016-11-11 01:52:02 +0000
committerGravatar Klaus Aehlig <aehlig@google.com>2016-11-11 10:05:07 +0000
commit0c0735a12f4491a2594bde7c6ac26c1a4d5b6bd9 (patch)
tree5307a07f987cdf526b1e897d19e406b96489c715 /src/main/java/com/google/devtools/build/lib/skyframe/PackageLookupValue.java
parent8b31ea61ae1dbfb4cf991bd5f26907b5c6e61793 (diff)
Update package lookup to check for files named BUILD.bazel before files named
BUILD. Fixes #552. RELNOTES[NEW]: Packages are defined in BUILD.bazel as well as BUILD files. -- MOS_MIGRATED_REVID=138828981
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/skyframe/PackageLookupValue.java')
-rw-r--r--src/main/java/com/google/devtools/build/lib/skyframe/PackageLookupValue.java7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/PackageLookupValue.java b/src/main/java/com/google/devtools/build/lib/skyframe/PackageLookupValue.java
index 8ad5ae0c06..32d1e9007f 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/PackageLookupValue.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/PackageLookupValue.java
@@ -39,6 +39,7 @@ public abstract class PackageLookupValue implements SkyValue {
* The file (BUILD, WORKSPACE, etc.) that defines this package, referred to as the "build file".
*/
public enum BuildFileName {
+
WORKSPACE("WORKSPACE") {
@Override
public PathFragment getBuildFileFragment(PackageIdentifier packageIdentifier) {
@@ -50,6 +51,12 @@ public abstract class PackageLookupValue implements SkyValue {
public PathFragment getBuildFileFragment(PackageIdentifier packageIdentifier) {
return packageIdentifier.getPackageFragment().getChild(getFilename());
}
+ },
+ BUILD_DOT_BAZEL("BUILD.bazel") {
+ @Override
+ public PathFragment getBuildFileFragment(PackageIdentifier packageIdentifier) {
+ return packageIdentifier.getPackageFragment().getChild(getFilename());
+ }
};
private static final BuildFileName[] VALUES = BuildFileName.values();