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

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

Merge "Disable jack completely" am: 480ee2e5 am: 56294539 am: 657f61bd 

am: 6f7a1cd2

Change-Id: I0f0d72df15e42ddd2529691a4222bb3a0abdc6d6
parents e27691dd 6f7a1cd2

core/combo/javac.mk

+1 −8
Original line number Diff line number Diff line
@@ -8,14 +8,7 @@ 
#   ANDROID_JAVA_TOOLCHAIN -- Directory that contains javac and other java tools

#



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

ANDROID_COMPILE_WITH_JACK := false

    endif

endif



ifdef TARGET_BUILD_APPS

  ifndef TURBINE_ENABLED