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

Commit 355de0a0 authored by Colin Cross's avatar Colin Cross Committed by Gerrit Code Review
Browse files

Merge "Switch from jack to javac for unbundled builds"

parents b182ea7b 210e5303

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