ART: Clean up global includes - icu4c
Remove icu4c from the ART-global includes.
Test: mmma art
Change-Id: Idffbb7f29af35d78e4f3aa09d1d3480153e151fa
diff --git a/build/Android.bp b/build/Android.bp
index 6766dd6..cde0bad 100644
--- a/build/Android.bp
+++ b/build/Android.bp
@@ -127,7 +127,6 @@
},
include_dirs: [
- "external/icu/icu4c/source/common",
"external/lz4/lib",
"external/valgrind/include",
"external/valgrind",
diff --git a/runtime/Android.bp b/runtime/Android.bp
index afc7d27..f6520a1 100644
--- a/runtime/Android.bp
+++ b/runtime/Android.bp
@@ -404,6 +404,7 @@
export_generated_headers: ["cpp-define-generator-asm-support"],
include_dirs: [
"art/sigchainlib",
+ "external/icu/icu4c/source/common",
],
header_libs: [
"art_cmdlineparser_headers",
@@ -516,6 +517,9 @@
header_libs: [
"libnativehelper_header_only",
],
+ include_dirs: [
+ "external/icu/icu4c/source/common",
+ ],
}
art_cc_test {
diff --git a/runtime/common_runtime_test.cc b/runtime/common_runtime_test.cc
index f15acf9..1504649 100644
--- a/runtime/common_runtime_test.cc
+++ b/runtime/common_runtime_test.cc
@@ -23,8 +23,8 @@
#include <cstdio>
#include "nativehelper/scoped_local_ref.h"
-#include "../../external/icu/icu4c/source/common/unicode/uvernum.h"
#include "android-base/stringprintf.h"
+#include <unicode/uvernum.h>
#include "art_field-inl.h"
#include "base/file_utils.h"