tree 28b3c4bb75a92b78fa96e3d05e5b90cad0a590e0
parent b94c5b8efd3f113d1bf71effd3f5fb4d6c03e198
parent 2e274f1a99d1b547a8c4a5606a2d006a80ab6e6c
author Colin Cross <ccross@android.com> 1508874502 -0700
committer Colin Cross <ccross@android.com> 1508874564 -0700

Merge remote-tracking branch 'aosp/upstream-master' into master

Also delete
java/com/google/devtools/build/android/desugar/dependencies/MetadataCollector.java
to avoid a proto dependency.

* aosp/upstream-master:
  Record dependencies when directly calling moved interface methods. RELNOTES: None.
  Exclude Android dependency checking from Bazel's singlejar build. This should also address https://github.com/bazelbuild/bazel/issues/3903 RELNOTES: None.
  Track expansions in OptionValueDescription.
  Remove feature to allow expansion flags to have values.
  Migrate all users of OptionsParser.enableParamsFileSupport to use the ShellQuotedParamsFilePreProcessor. This covers all of the tools packaged in the ResourceProcessorBusyBox.
  Track Option placement within a priority category.
  Make option conflicts less spammy.
  Desugar-singlejar integration tests for double-checking default methods.
  Expand implicitRequirements in the location of the option that required it.
  Remove the implicit requirement of core_library.
  Clean up InvocationPolicy's use of OptionDescription.
  Report the structured Bazel command line via the BEP.
  Do not rewrite static interface method invocations from bootclasspath
  Downgrade the default invocation policy log levels to fine.
  Categorize build options for BuildConfiguration.
  add flags to desugar to emit metadata that can be used for double-checking correctness of default and static interface desugaring. RELNOTES: none
  Add new option categorization and tagging information to HelpCommand's output.
  Move the canonicalization of an option value to the option value itself.

Test: m checkbuild
Change-Id: Ie86c647a0350bea0986bd1d8df95486b3fe585c3