diff options
| -rw-r--r-- | build/Android.common.mk | 2 | ||||
| -rw-r--r-- | src/common_test.h | 3 | ||||
| -rw-r--r-- | src/jni_internal_test.cc | 1 |
3 files changed, 2 insertions, 4 deletions
diff --git a/build/Android.common.mk b/build/Android.common.mk index cd0b27f6c9..fcea9168d0 100644 --- a/build/Android.common.mk +++ b/build/Android.common.mk @@ -53,8 +53,6 @@ ART_CPP_EXTENSION := .cc 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 9dbdbfc09d..e4996a31a0 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 d94da1ef65..7925aea97c 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" |