summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jerome Gaillard <jgaillard@google.com> 2019-06-28 13:37:33 +0100
committer Jerome Gaillard <jgaillard@google.com> 2019-06-28 13:37:33 +0100
commit1d2783018e2ed32d22833c68c7438149d2f1a571 (patch)
tree47759f9c55b5fdb58ffe06713fe1c276af4dd467
parent1e611b12299c60664c25bde458790994c4f5dd51 (diff)
Do no use libandroidicu for host targets
It should only be used on device. Bug: 130787951 Test: m libandroid_runtime Change-Id: Iace45f57a1108f4cd8787f0d3554a1724b912ae1
-rw-r--r--core/jni/Android.bp6
1 files changed, 5 insertions, 1 deletions
diff --git a/core/jni/Android.bp b/core/jni/Android.bp
index b21221f2efff..b50b8248ee8d 100644
--- a/core/jni/Android.bp
+++ b/core/jni/Android.bp
@@ -100,7 +100,6 @@ cc_library_shared {
],
shared_libs: [
- "libandroidicu",
"libbase",
"libcutils",
"libharfbuzz_ng",
@@ -267,6 +266,7 @@ cc_library_shared {
],
shared_libs: [
+ "libandroidicu",
"libbpf_android",
"libnetdbpf",
"libnetdutils",
@@ -344,6 +344,10 @@ cc_library_shared {
include_dirs: [
"external/vulkan-headers/include",
],
+ shared_libs: [
+ "libicui18n",
+ "libicuuc",
+ ],
static_libs: [
"libandroidfw",
"libcompiler_rt",