p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Revert "build/make/core: Fix fragile assumptions about build toolchain.""

This commit is contained in:
Tobias Thierer 2017-05-18 14:25:14 +00:00 committed by Gerrit Code Review
parent b371c7756a 4c764abf37
commit a0203a6544
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/definitions.mk
View File

@ -2535,12 +2535,7 @@ define desugar-classes-jar
@echo Desugar: $@ @echo Desugar: $@
@mkdir -p $(dir $@) @mkdir -p $(dir $@)
$(hide) rm -f $@ $@.tmp $(hide) rm -f $@ $@.tmp
@rm -rf $(dir $@)/desugar_dumped_classes $(hide) java -jar $(DESUGAR) \
@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,7 +175,6 @@ $(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 \
-XDignore.symbol.file \ -XDignore.symbol.file \