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

Merge "build/make/core: Fix fragile assumptions about build toolchain." am: b371c7756a am: 68587c24a9

Browse source 
am: bbe4662305

Change-Id: I1cdcfa09a9bab0a519ff695a9b6eb86afa5d71bc
This commit is contained in:
Tobias Thierer 2017-05-18 12:21:43 +00:00 committed by android-build-merger
commit 4c1d087d7e
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
core/definitions.mk
View file

@ -2543,7 +2543,12 @@ define desugar-classes-jar
@echo Desugar: $@ @echo Desugar: $@
@mkdir -p $(dir $@) @mkdir -p $(dir $@)
$(hide) rm -f $@ $@.tmp $(hide) rm -f $@ $@.tmp
$(hide) java -jar $(DESUGAR) \ @rm -rf $(dir $@)/desugar_dumped_classes
@mkdir $(dir $@)/desugar_dumped_classes
$(hide) java \
--add-opens java.base/java.lang.invoke=ALL-UNNAMED \
-Djdk.internal.lambda.dumpProxyClasses=$(dir $@)/desugar_dumped_classes \
-jar $(DESUGAR) \
$(addprefix --bootclasspath_entry ,$(call desugar-bootclasspath,$(PRIVATE_BOOTCLASSPATH))) \ $(addprefix --bootclasspath_entry ,$(call desugar-bootclasspath,$(PRIVATE_BOOTCLASSPATH))) \
$(addprefix --classpath_entry ,$(PRIVATE_ALL_JAVA_LIBRARIES)) \ $(addprefix --classpath_entry ,$(PRIVATE_ALL_JAVA_LIBRARIES)) \
--min_sdk_version $(call codename-or-sdk-to-sdk,$(PRIVATE_DEFAULT_APP_TARGET_SDK)) \ --min_sdk_version $(call codename-or-sdk-to-sdk,$(PRIVATE_DEFAULT_APP_TARGET_SDK)) \

1
core/droiddoc.mk
View file

@ -175,6 +175,7 @@ $(full_target): \
$(hide) ( \ $(hide) ( \
javadoc \ javadoc \
-encoding UTF-8 \ -encoding UTF-8 \
-source 1.8 \
\@$(PRIVATE_SRC_LIST_FILE) \ \@$(PRIVATE_SRC_LIST_FILE) \
-J-Xmx1600m \ -J-Xmx1600m \
-J-XX:-OmitStackTraceInFastThrow \ -J-XX:-OmitStackTraceInFastThrow \