Fix icu4c include path pollution.
Change-Id: Ie96abd97ea98fd36cc9a796a3ce35233addfd1ee
diff --git a/build/Android.common.mk b/build/Android.common.mk
index cd0b27f..fcea916 100644
--- a/build/Android.common.mk
+++ b/build/Android.common.mk
@@ -53,8 +53,6 @@
ART_C_INCLUDES := \
external/gtest/include \
- external/icu4c/common \
- external/icu4c/i18n \
external/valgrind/dynamic_annotations \
external/zlib \
art/src
diff --git a/src/common_test.h b/src/common_test.h
index 9dbdbfc..e4996a3 100644
--- a/src/common_test.h
+++ b/src/common_test.h
@@ -20,6 +20,7 @@
#include <sys/stat.h>
#include <sys/types.h>
+#include "../../external/icu4c/common/unicode/uvernum.h"
#include "base/macros.h"
#include "base/unix_file/fd_file.h"
#include "class_linker.h"
@@ -38,8 +39,6 @@
#include "stl_util.h"
#include "stringprintf.h"
#include "thread.h"
-#include "unicode/uclean.h"
-#include "unicode/uvernum.h"
#include "UniquePtr.h"
#include "well_known_classes.h"
diff --git a/src/jni_internal_test.cc b/src/jni_internal_test.cc
index d94da1e..7925aea 100644
--- a/src/jni_internal_test.cc
+++ b/src/jni_internal_test.cc
@@ -16,6 +16,7 @@
#include "jni_internal.h"
+#include <cfloat>
#include <cmath>
#include "common_test.h"