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

Commit 4e380436 authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

Merge "Switch from jack to javac for unbundled builds" am: 355de0a0 

am: a9384620

Change-Id: I4e611d81664d10acaa7e1cbbdd10b27a72b49a47
parents 1e7f83bf a9384620

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



ifdef TARGET_BUILD_APPS

  ifndef TURBINE_ENABLED