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

Commit 210e5303 authored by Colin Cross's avatar Colin Cross
Browse files

Switch from jack to javac for unbundled builds 

Default to ANDROID_COMPILE_WITH_JACK=false when TARGET_BUILD_APPS
is set.

Test: m -j TARGET_BUILD_APPS=Gallery2
Change-Id: Ibd2bdac6c7e2c4e2c6107fd35bd049fc8cb8dafe
parent 78542b9e

core/combo/javac.mk

+1 −6
Original line number Diff line number Diff line
@@ -12,15 +12,10 @@ ifndef ANDROID_COMPILE_WITH_JACK 
    # TODO(b/64113890, b/35788202): remove PRODUCT_COMPILE_WITH_JACK

    ifdef PRODUCT_COMPILE_WITH_JACK

        ANDROID_COMPILE_WITH_JACK := $(PRODUCT_COMPILE_WITH_JACK)

    else

        # TODO(b/62038127): remove TARGET_BUILD_APPS check

        ifdef TARGET_BUILD_APPS

            ANDROID_COMPILE_WITH_JACK := true

    else

        ANDROID_COMPILE_WITH_JACK := false

    endif

endif

endif



ifeq ($(OVERRIDE_ANDROID_JAVA_HOME),)

ANDROID_JAVA_HOME := prebuilts/jdk/jdk8/$(HOST_PREBUILT_TAG)