tree 55312a015f2b54ff5a4652fd228ac9c5c0b552ef
parent 23c69591372863b9e0166768d37ef0915c38977e
parent 7c89da8b546751337e5a1b67c3e1e52cb4467a4a
author Colin Cross <ccross@android.com> 1521003365 -0700
committer Colin Cross <ccross@android.com> 1521004878 -0700

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

* aosp/upstream-master: (38 commits)
  Support empty bootclasspaths
  Tolerate empty params files in turbine
  Don't crash on private interface methods
  Change the strict deps plugin to read jar owner from manifest.
  Remove support for --rule_kind
  Remove deprecated rule_kind argument from Turbine
  Use a different date time when normalizing zip entries
  Accept --target_label, --injecting_rule_kind in Turbine.
  Stop skipping module-infos
  Don't error out if modules can't be resolved
  Refactor TurbineOptions to make jarToTarget/directJars the source of truth
  Change Turbine command lines to not require CustomMultiArgv.
  Initial end-to-end support for module-infos
  Class writing support for module attributes
  Reduce coupling between ConstBinder and SourceTypeBoundClass
  Class reading support for module attributes
  Initial support for parsing module-infos.
  Allow --bootclasspath and --release to be used together
  Propagate --release flags from --javacopts to turbine's --release flag
  Add JDK 9 travis build
  ...

Bug: 74332665
Bug: 74339924
Test: m checkbuild
Change-Id: I26280b1fd483e92b5075f985d3169edb63303c5b