Remove DynamicModeFlag and thus fix crash caused by passing --dynamic_mode=auto on the command line.

--
PiperOrigin-RevId: 147824992
MOS_MIGRATED_REVID=147824992

1 files changed, 2 insertions, 2 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java
index b57165e9fe..b6923579cf 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java
@@ -30,8 +30,8 @@ import com.google.devtools.build.lib.analysis.config.InvalidConfigurationExcepti
 import com.google.devtools.build.lib.cmdline.Label;
 import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable;
 import com.google.devtools.build.lib.packages.Attribute.SplitTransition;
+import com.google.devtools.build.lib.rules.cpp.CppConfiguration.DynamicMode;
 import com.google.devtools.build.lib.rules.cpp.CppOptions.DynamicModeConverter;
-import com.google.devtools.build.lib.rules.cpp.CppOptions.DynamicModeFlag;
 import com.google.devtools.common.options.Converter;
 import com.google.devtools.common.options.Converters;
 import com.google.devtools.common.options.EnumConverter;
@@ -250,7 +250,7 @@ public class AndroidConfiguration extends BuildConfiguration.Fragment {
             + "whether to link dynamically.  'fully' means all libraries will be linked "
             + "dynamically. 'off' means that all libraries will be linked in mostly static mode."
     )
-    public DynamicModeFlag dynamicMode;
+    public DynamicMode dynamicMode;
 
     // Label of filegroup combining all Android tools used as implicit dependencies of
     // android_* rules