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

Commit 6ce5a428 authored by Colin Cross's avatar Colin Cross Committed by Gerrit Code Review
Browse files

Merge "Compile with javac by default"

parents a2ea9626 75b50421

core/combo/javac.mk

+11 −2
Original line number Diff line number Diff line
@@ -10,8 +10,17 @@ 
#



ifndef ANDROID_COMPILE_WITH_JACK

# Defines if compilation with jack is enabled by default.

    # 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



common_jdk_flags := -Xmaxerrs 9999999

core/product.mk

+1 −0
Original line number Diff line number Diff line
@@ -141,6 +141,7 @@ _product_var_list := \ 
    PRODUCT_SYSTEM_HEADROOM \

    PRODUCT_MINIMIZE_JAVA_DEBUG_INFO \

    PRODUCT_INTEGER_OVERFLOW_EXCLUDE_PATHS \

    PRODUCT_COMPILE_WITH_JACK \

core/product_config.mk

+4 −0
Original line number Diff line number Diff line
@@ -449,3 +449,7 @@ PRODUCT_MINIMIZE_JAVA_DEBUG_INFO := \ 
# Whether any paths are excluded from sanitization when SANITIZE_TARGET=integer_overflow

PRODUCT_INTEGER_OVERFLOW_EXCLUDE_PATHS := \

    $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_INTEGER_OVERFLOW_EXCLUDE_PATHS))



# Temporarily force Jack back on for a product

PRODUCT_COMPILE_WITH_JACK := \

    $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_COMPILE_WITH_JACK))