p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Compile with javac by default" am: 6ce5a428ae 

am: 4954077f5e

Change-Id: I3385243cfd76383aacb2c9250bf3e23d94e03e9c
This commit is contained in:
Colin Cross 2017-08-01 18:37:00 +00:00 committed by android-build-merger
parent 471e2ba1d6 4954077f5e
commit 99ee8d25c7
3 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
core/combo/javac.mk
View File

@ -10,8 +10,17 @@
# #
ifndef ANDROID_COMPILE_WITH_JACK ifndef ANDROID_COMPILE_WITH_JACK
# Defines if compilation with jack is enabled by default. # TODO(b/64113890, b/35788202): remove PRODUCT_COMPILE_WITH_JACK
ANDROID_COMPILE_WITH_JACK := true 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 endif
common_jdk_flags := -Xmaxerrs 9999999 common_jdk_flags := -Xmaxerrs 9999999

1
core/product.mk
View File

@ -141,6 +141,7 @@ _product_var_list := \
PRODUCT_SYSTEM_HEADROOM \ PRODUCT_SYSTEM_HEADROOM \
PRODUCT_MINIMIZE_JAVA_DEBUG_INFO \ PRODUCT_MINIMIZE_JAVA_DEBUG_INFO \
PRODUCT_INTEGER_OVERFLOW_EXCLUDE_PATHS \ PRODUCT_INTEGER_OVERFLOW_EXCLUDE_PATHS \
PRODUCT_COMPILE_WITH_JACK \

4
core/product_config.mk
View File

@ -449,3 +449,7 @@ PRODUCT_MINIMIZE_JAVA_DEBUG_INFO := \
# Whether any paths are excluded from sanitization when SANITIZE_TARGET=integer_overflow # Whether any paths are excluded from sanitization when SANITIZE_TARGET=integer_overflow
PRODUCT_INTEGER_OVERFLOW_EXCLUDE_PATHS := \ PRODUCT_INTEGER_OVERFLOW_EXCLUDE_PATHS := \
$(strip $(PRODUCTS.$(INTERNAL_PRODUCT).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))