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

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

Merge "Disable jack completely" 

am: 480ee2e5

Change-Id: I72f0d856228dc5b68e5f581802d5a64f9c814255
parents 2e21024c 480ee2e5

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