diff options
| author |  ccalvarin <ccalvarin@google.com> | 2017-10-16 22:18:32 +0200 |
|---|---|---|
| committer |  Jakob Buchgraber <buchgr@google.com> | 2017-10-18 10:27:58 +0200 |
| commit | 7cd9e883dd31f54cd505844aa1f1e0ed7bd9f380 (patch) | |
| tree | e72e67a2f22108d490aaf4b5a59e5727e855547d /src/main/java/com/google/devtools/build/lib/runtime/mobileinstall | |
| parent | b6bf11217c30123827d36a35a3614ba8e200f349 (diff) | |
Track Option placement within a priority category.
An option has precedence over previous options at the same enum-valued priority. Track its placement in this ordering explicitly.
This will allow after-the-fact expansion of expansion options such that they correctly take precedence or not compared to other mentions of the same flag. This is needed to fix --config's expansion.
RELNOTES: None.
PiperOrigin-RevId: 172367996
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/runtime/mobileinstall')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/runtime/mobileinstall/MobileInstallCommand.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/mobileinstall/MobileInstallCommand.java b/src/main/java/com/google/devtools/build/lib/runtime/mobileinstall/MobileInstallCommand.java index 8a83400c63..0249403160 100644 --- a/src/main/java/com/google/devtools/build/lib/runtime/mobileinstall/MobileInstallCommand.java +++ b/src/main/java/com/google/devtools/build/lib/runtime/mobileinstall/MobileInstallCommand.java @@ -42,7 +42,7 @@ import com.google.devtools.common.options.EnumConverter; import com.google.devtools.common.options.Option; import com.google.devtools.common.options.OptionDocumentationCategory; import com.google.devtools.common.options.OptionEffectTag; -import com.google.devtools.common.options.OptionPriority; +import com.google.devtools.common.options.OptionPriority.PriorityCategory; import com.google.devtools.common.options.OptionsBase; import com.google.devtools.common.options.OptionsParser; import com.google.devtools.common.options.OptionsParsingException; @@ -301,12 +301,12 @@ public class MobileInstallCommand implements BlazeCommand { ? "mobile_install_incremental" + INTERNAL_SUFFIX : "mobile_install_full" + INTERNAL_SUFFIX; optionsParser.parse( - OptionPriority.COMMAND_LINE, + PriorityCategory.COMMAND_LINE, "Options required by the mobile-install command", ImmutableList.of("--output_groups=" + outputGroup)); } else { optionsParser.parse( - OptionPriority.COMMAND_LINE, + PriorityCategory.COMMAND_LINE, "Options required by the skylark implementation of mobile-install command", ImmutableList.of( "--aspects=" + options.mobileInstallAspect + "%" + options.mode.getAspectName(), |