Fix fragile assumptions about build toolchain. (attempt #2)
This CL resubmits a fixed version of commit e2a8da26. This CL applies the following changes: - explicitly set the path where desugar will dump temporary class files. This ensures that the system property is set before it is read during InnerClassLambdaMetafactory.<clinit>. Before this CL, the system property was set by Desugar.createAndRegisterLambdaDumpDirectory(), which may run too late. - explicitly specify -source 1.8 for droiddoc's javadoc run. Previously, the command used the language version of the build toolchain, which might fail due the backward-incompatible restrictions imposed by the proposed module system. Some Android build targets use LOCAL_JAVA_LANGUAGE_VERSION 1.7, but droiddoc combines sources from multiple build targets and there where no backwards incompatible changes in 1.8, so it should be fine to use 1.8 for code from either language level. Bug: 38318052 Bug: 38225656 Bug: 38177295 Test: make clean && make ANDROID_COMPILE_WITH_JACK=false checkbuild tests \ && make checkbuild tests (using OpenJDK 8 toolchain) Change-Id: I2fffe6668747f48be44e34c67332af9b8a996d2a
Loading
Please register or sign in to comment