tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Revert "Desugar default methods if required""

Browse source
This commit is contained in:
Colin Cross 2017-10-25 22:33:08 +00:00 committed by Gerrit Code Review
commit 4d85d55e09
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/definitions.mk
View file

@ -2385,6 +2385,7 @@ $(if $(filter $(1),$(PLATFORM_VERSION_CODENAME)),10000,$(1))
endef endef
# --add-opens is required because desugar reflects via java.lang.invoke.MethodHandles.Lookup # --add-opens is required because desugar reflects via java.lang.invoke.MethodHandles.Lookup
# --desugar_try_with_resources_if_needed=false is needed due to b/63180735, b/63901645, b/63900665
define desugar-classes-jar define desugar-classes-jar
@echo Desugar: $@ @echo Desugar: $@
@mkdir -p $(dir $@) @mkdir -p $(dir $@)
@ -2397,7 +2398,8 @@ $(hide) $(JAVA) \
-jar $(DESUGAR) \ -jar $(DESUGAR) \
$(addprefix --bootclasspath_entry ,$(PRIVATE_BOOTCLASSPATH)) \ $(addprefix --bootclasspath_entry ,$(PRIVATE_BOOTCLASSPATH)) \
$(addprefix --classpath_entry ,$(PRIVATE_ALL_JAVA_HEADER_LIBRARIES)) \ $(addprefix --classpath_entry ,$(PRIVATE_ALL_JAVA_HEADER_LIBRARIES)) \
--min_sdk_version $(call codename-or-sdk-to-sdk,$(PRIVATE_MIN_SDK_VERSION)) \ --min_sdk_version $(call codename-or-sdk-to-sdk,$(PRIVATE_DEFAULT_APP_TARGET_SDK)) \
--desugar_try_with_resources_if_needed=false \
--allow_empty_bootclasspath \ --allow_empty_bootclasspath \
$(if $(filter --core-library,$(PRIVATE_DX_FLAGS)),--core_library) \ $(if $(filter --core-library,$(PRIVATE_DX_FLAGS)),--core_library) \
-i $< -o $@.tmp -i $< -o $@.tmp