commit 1a1e77f1a5864352b8187bc01d0a3e6851e03cf7
author Dmitriy Ivanov <dimitry@google.com> Wed May 27 15:34:38 2015 -0700
committer Dmitriy Ivanov <dimitry@google.com> Wed May 27 16:29:35 2015 -0700
tree 009062cd081373fb2a6e8522fec0239fcc1bc13a
parent 86a5b0ee6810e1bea97419928ef7f1624eb0872e

Fix valgrind includes

 external/valgrind structure has been changed
 to reflect upstream projects struture.

 Making corresponding changes to art includes.

Bug: http://b/21471495
Change-Id: I2434a270f88502528df82c4820afedb002b65b8d
(cherry picked from commit 6130f739d8f35e01037ba5c3ec5e5a1057900479)

build/Android.common_build.mk

diff --git a/build/Android.common_build.mk b/build/Android.common_build.mk
index 3e427a3..b84154b 100644
--- a/build/Android.common_build.mk
+++ b/build/Android.common_build.mk
@@ -177,8 +177,8 @@
 ART_C_INCLUDES := \
   external/gtest/include \
   external/icu/icu4c/source/common \
-  external/valgrind/main/include \
-  external/valgrind/main \
+  external/valgrind/include \
+  external/valgrind \
   external/vixl/src \
   external/zlib \