commit 1e13374baf7dfaf442ffbf9809c37c131d681eaf
author Evgenii Stepanov <eugenis@google.com> Wed May 20 12:30:59 2015 -0700
committer Evgenii Stepanov <eugenis@google.com> Mon Jul 13 17:38:40 2015 -0700
tree 9a8a53295a8389d7ec10accf3efb8785a97a3599
parent f68c8545382925062da2b87169ca2b5314f0b431

Generalize Valgrind annotations in ART to support ASan.

Also add redzones around non-fixed mem_map(s).
Also extend -Wframe-larger-than limit to enable arm64 ASan build.

Change-Id: Ie572481a25fead59fc8978d2c317a33ac418516c

build/Android.common_build.mk

diff --git a/build/Android.common_build.mk b/build/Android.common_build.mk
index ee0cb09..83dd690 100644
--- a/build/Android.common_build.mk
+++ b/build/Android.common_build.mk
@@ -266,10 +266,10 @@
   # Larger frame-size for host clang builds today
   ifneq ($(ART_COVERAGE),true)
     ifneq ($(NATIVE_COVERAGE),true)
-      ifndef SANITIZE_HOST
-        art_host_non_debug_cflags += -Wframe-larger-than=2700
-      endif
-      ifndef SANITIZE_TARGET
+      art_host_non_debug_cflags += -Wframe-larger-than=2700
+      ifdef SANITIZE_TARGET
+        art_target_non_debug_cflags += -Wframe-larger-than=5450
+      else
         art_target_non_debug_cflags += -Wframe-larger-than=1728
       endif
     endif