Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1a48fbca authored by Tobias Thierer's avatar Tobias Thierer Committed by android-build-merger
Browse files

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

Merge "Revert "build/make/core: Fix fragile assumptions about build toolchain."" am: a0203a65 am: 64517075
am: aadebe10

Change-Id: I97126a25f703974f3829cb1b41c1f710e80cbd4e
parents 4c1d087d aadebe10

core/definitions.mk

+1 −6
Original line number Diff line number Diff line
@@ -2543,12 +2543,7 @@ define desugar-classes-jar 
@echo Desugar: $@

@mkdir -p $(dir $@)

$(hide) rm -f $@ $@.tmp

@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) \

$(hide) java -jar $(DESUGAR) \

    $(addprefix --bootclasspath_entry ,$(call desugar-bootclasspath,$(PRIVATE_BOOTCLASSPATH))) \

    $(addprefix --classpath_entry ,$(PRIVATE_ALL_JAVA_LIBRARIES)) \

    --min_sdk_version $(call codename-or-sdk-to-sdk,$(PRIVATE_DEFAULT_APP_TARGET_SDK)) \

core/droiddoc.mk

+0 −1
Original line number Diff line number Diff line
@@ -175,7 +175,6 @@ $(full_target): \ 
	$(hide) ( \

		javadoc \

                -encoding UTF-8 \

                -source 1.8 \

                \@$(PRIVATE_SRC_LIST_FILE) \

                -J-Xmx1600m \

                -J-XX:-OmitStackTraceInFastThrow \