From 56eb80b11f475a2e5b6e8803aeb3cf2294e329b4 Mon Sep 17 00:00:00 2001 From: gregce Date: Wed, 2 May 2018 09:04:10 -0700 Subject: Simplify config fragment creation. Remove all unnecessesary accesses to ConfigurationEnvironment and deprecate the accesses that actually need ConfigurationEnvironment. For review, check out ConfigurationFragmentFactory first. PiperOrigin-RevId: 195099768 --- .../com/google/devtools/build/lib/rules/proto/ProtoConfiguration.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/main/java/com/google/devtools/build/lib/rules/proto') diff --git a/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoConfiguration.java index c730a7b874..a5706d9bc2 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoConfiguration.java +++ b/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoConfiguration.java @@ -20,7 +20,6 @@ import com.google.devtools.build.lib.analysis.config.BuildConfiguration; import com.google.devtools.build.lib.analysis.config.BuildConfiguration.Fragment; import com.google.devtools.build.lib.analysis.config.BuildConfiguration.StrictDepsMode; import com.google.devtools.build.lib.analysis.config.BuildOptions; -import com.google.devtools.build.lib.analysis.config.ConfigurationEnvironment; import com.google.devtools.build.lib.analysis.config.ConfigurationFragmentFactory; import com.google.devtools.build.lib.analysis.config.FragmentOptions; import com.google.devtools.build.lib.analysis.config.InvalidConfigurationException; @@ -177,7 +176,7 @@ public class ProtoConfiguration extends Fragment { */ public static class Loader implements ConfigurationFragmentFactory { @Override - public Fragment create(ConfigurationEnvironment env, BuildOptions buildOptions) + public Fragment create(BuildOptions buildOptions) throws InvalidConfigurationException { return new ProtoConfiguration(buildOptions.get(Options.class)); } -- cgit v1.2.3