diff options
| author |  Lukacs Berki <lberki@google.com> | 2015-09-17 13:09:03 +0000 |
|---|---|---|
| committer |  David Chen <dzc@google.com> | 2015-09-17 19:35:38 +0000 |
| commit | afc93a6645d6c8b5be933b48137ac5d0c6aafd61 (patch) | |
| tree | 6abe4576b2351bbba046816ddf27a601ff442f00 /src/main/java/com/google/devtools/build/lib/packages | |
| parent | de27f9e46892f6dd95966185a7cf09e256dfe5ff (diff) | |
Rollback of commit 4e5037520e3067f9d8784e1c59f9545b96111cd4.
*** Reason for rollback ***
Broke tests, I mistakenly assumed it was flakiness.
*** Original change description ***
Remove support for the deprecated include() statement.
This is part of the crusade to eliminate as every dependency in Skylark on the rest of the code so that it can be moved deeper in the dependency graph.
RELNOTES: The include() statement in BUILD files is not supported anymore.
--
MOS_MIGRATED_REVID=103284257
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/packages')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/packages/PackageFactory.java | 2 | ||||
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/packages/WorkspaceFactory.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/packages/PackageFactory.java b/src/main/java/com/google/devtools/build/lib/packages/PackageFactory.java index c192738a22..2b09e7b803 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/PackageFactory.java +++ b/src/main/java/com/google/devtools/build/lib/packages/PackageFactory.java @@ -989,7 +989,7 @@ public final class PackageFactory { // Logged messages are used as a testability hook tracing the parsing progress LOG.fine("Starting to parse " + packageId); BuildFileAST buildFileAST = BuildFileAST.parseBuildFile( - preprocessingResult.result, preludeStatements, localReporter, false); + preprocessingResult.result, preludeStatements, localReporter, locator, false); LOG.fine("Finished parsing of " + packageId); MakeEnvironment.Builder makeEnv = new MakeEnvironment.Builder(); diff --git a/src/main/java/com/google/devtools/build/lib/packages/WorkspaceFactory.java b/src/main/java/com/google/devtools/build/lib/packages/WorkspaceFactory.java index 22df6d780e..a19b36bd18 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/WorkspaceFactory.java +++ b/src/main/java/com/google/devtools/build/lib/packages/WorkspaceFactory.java @@ -75,7 +75,7 @@ public class WorkspaceFactory { throws InterruptedException { StoredEventHandler localReporter = new StoredEventHandler(); BuildFileAST buildFileAST; - buildFileAST = BuildFileAST.parseBuildFile(source, localReporter, false); + buildFileAST = BuildFileAST.parseBuildFile(source, localReporter, null, false); if (buildFileAST.containsErrors()) { localReporter.handle(Event.error("WORKSPACE file could not be parsed")); } else { |