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

Commit c4e2f279 authored by Yoshisato Yanagisawa's avatar Yoshisato Yanagisawa Committed by android-build-merger
Browse files

Merge "Make SOONG_JAVAC_WRAPPER use JAVAC_WRAPPER to call javac." am:... 

Merge "Make SOONG_JAVAC_WRAPPER use JAVAC_WRAPPER to call javac." am: 51e7a0cc am: 5de0a222 am: cf07f0dc
am: af4998f6

Change-Id: I4bb0e63935d31ebfdbfbb2806ae47c529e90ec11
parents 02871f24 af4998f6

core/definitions.mk

+1 −1
Original line number Diff line number Diff line
@@ -2249,7 +2249,7 @@ $(hide) rm -rf $(PRIVATE_CLASS_INTERMEDIATES_DIR) $(PRIVATE_ANNO_INTERMEDIATES_D 
$(hide) mkdir -p $(dir $@)

$(hide) mkdir -p $(PRIVATE_CLASS_INTERMEDIATES_DIR) $(PRIVATE_ANNO_INTERMEDIATES_DIR)

$(hide) if [ -s $(PRIVATE_JAVA_SOURCE_LIST) ] ; then \

    $(SOONG_JAVAC_WRAPPER) $(1) -encoding UTF-8 \

    $(SOONG_JAVAC_WRAPPER) $(JAVAC_WRAPPER) $(1) -encoding UTF-8 \

    $(if $(findstring true,$(PRIVATE_WARNINGS_ENABLE)),$(xlint_unchecked),) \

    $(addprefix -bootclasspath ,$(strip \

        $(call normalize-path-list,$(PRIVATE_BOOTCLASSPATH)) \