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

Commit 57fa914a authored by Tobias Thierer's avatar Tobias Thierer Committed by android-build-merger
Browse files

Merge "Fix fragile assumptions about build toolchain. (attempt #2)" am: 48ee187e am: b9511c87 

am: d7f60e4f

Change-Id: I7cff67ba4208293eacf7a9346c99b9f964ba270b
parents 43c6e2b6 d7f60e4f

core/definitions.mk

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

@mkdir -p $(dir $@)

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

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

@rm -rf $(dir $@)/desugar_dumped_classes

@mkdir $(dir $@)/desugar_dumped_classes

$(hide) java \

    -Djdk.internal.lambda.dumpProxyClasses=$(abspath $(dir $@))/desugar_dumped_classes \

    -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

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

		javadoc \

                -encoding UTF-8 \

                -source 1.8 \

                \@$(PRIVATE_SRC_LIST_FILE) \

                -J-Xmx1600m \

                -J-XX:-OmitStackTraceInFastThrow \