commit ed5be4500687264ac1e84d5c17f4c5e6f33f2d69
author Ulf Adams <ulfjack@google.com> Wed Nov 02 16:33:57 2016 +0000
committer Laszlo Csomor <laszlocsomor@google.com> Wed Nov 02 17:27:52 2016 +0000
tree ad33ce28999fdd163e4377d8633ea0e140791507
parent 436800456165a60009d90ab55cce11fa10d8b756

Merge BlazeModule.getEnvironmentExtensions into serverInit / ServerBuilder.

--
MOS_MIGRATED_REVID=137955061

src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java

diff --git a/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java b/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java
index 5037ee6..61a02ab 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java
@@ -1090,11 +1090,6 @@
 
       ConfiguredRuleClassProvider ruleClassProvider = ruleClassBuilder.build();
 
-      List<PackageFactory.EnvironmentExtension> extensions = new ArrayList<>();
-      for (BlazeModule module : blazeModules) {
-        extensions.add(module.getPackageEnvironmentExtension());
-      }
-
       Package.Builder.Helper packageBuilderHelper = null;
       for (BlazeModule module : blazeModules) {
         Package.Builder.Helper candidateHelper =
@@ -1114,7 +1109,7 @@
               ruleClassProvider,
               ruleClassBuilder.getPlatformRegexps(),
               serverBuilder.getAttributeContainerFactory(),
-              extensions,
+              serverBuilder.getEnvironmentExtensions(),
               BlazeVersionInfo.instance().getVersion(),
               packageBuilderHelper);