diff options
| author | Simon Shields <keepcalm444@gmail.com> | 2015-12-06 12:26:48 +1100 |
|---|---|---|
| committer | Simon Shields <keepcalm444@gmail.com> | 2015-12-06 21:40:28 +1100 |
| commit | 29bd42b5eb0382360e3a8cb646ccf4de4b3b1d5a (patch) | |
| tree | 55f88c2f7af8e45ac56367dc98032f8ff5a5a6bc /compiler/Android.mk | |
| parent | 7890e2edd305ddacfe76b37337cdbe95bcd588f8 (diff) | |
| download | art-29bd42b5eb0382360e3a8cb646ccf4de4b3b1d5a.zip art-29bd42b5eb0382360e3a8cb646ccf4de4b3b1d5a.tar.gz art-29bd42b5eb0382360e3a8cb646ccf4de4b3b1d5a.tar.bz2 | |
art: allow devices to disable CAF bailout patches
these patches seem to break dex2oat on some non-qcom boards
Change-Id: Ib70ca7e12d45ea49cbfa3f6acd04fe4a7f015055
Diffstat (limited to 'compiler/Android.mk')
| -rw-r--r-- | compiler/Android.mk | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/compiler/Android.mk b/compiler/Android.mk index 5dbcd07..1ed0490 100644 --- a/compiler/Android.mk +++ b/compiler/Android.mk @@ -243,6 +243,11 @@ $$(ENUM_OPERATOR_OUT_GEN): $$(GENERATED_SRC_DIR)/%_operator_out.cc : $(LOCAL_PAT endif endif + ifneq ($(TARGET_HAVE_QC_PERF),true) + # CAF bailout patches break dex2oat on some devices - disable them if unneeded + LOCAL_CFLAGS += -DDISABLE_CAF_BAILOUT + endif + LOCAL_C_INCLUDES += $(ART_C_INCLUDES) art/runtime ifeq ($$(art_target_or_host),host) |