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

* aosp/upstream-master:
  Improve exception message to output more information. RELNOTES:None.
  Remove static import of inner class InferredType's fields
  Automatic code cleanup.
  Let to push lambda arguments not only with *LOAD instructions but with SIPUSH and *CONST_*.
  Fix canonical option list for options that implicitly require options with allowMultiple=true
  Change config expansion application order, gated by startup flag --expand_configs_in_place.
  Specialize $closeResource(Throwable, AutoCloseable) so that desugared code does not depend on AutoCloseable, as it is not available before API 19.
  Fix EnclosingMethod attribute when moving interface methods to companion class RELNOTES: None.
  Cleanup stream use in canonical list of options.
  Remove unused LegacyParamsFilePreProcessor. Removed test cases from OptionsParserTest are implemented in ParamsFilePreProcessorTest, ShellQuotedParamsFilePreProcessorTest and UnquotedParamsFilePreProcessorTest.
  Switch on tracking of specific option priorities.
  Compute canonical list of options using OptionValueDescription's tracking of instances.

Test: m checkbuild
Change-Id: Idb762b0dabc9660d9116d1b976fb2f74aa7f5e09

1 files changed, 25 insertions, 0 deletions

diff --git a/test/java/com/google/devtools/build/android/desugar/classes_for_testing_type_inference/generate_jar.sh b/test/java/com/google/devtools/build/android/desugar/classes_for_testing_type_inference/generate_jar.sh
new file mode 100755
index 0000000..1166620
--- /dev/null
+++ b/test/java/com/google/devtools/build/android/desugar/classes_for_testing_type_inference/generate_jar.sh
@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+#
+# Copyright 2016 The Bazel Authors. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#
+# I intentionally create this script to create a checked-in jar, because the test cases for
+# byte code type inference uses golden files, which consequently relies on the version of javac
+# compilers. So instead of creating jar files at build time, we check in a jar file.
+#
+
+javac testsubjects/TestSubject.java
+
+jar cf test_subjects.jar testsubjects/TestSubject.class
\ No newline at end of file