summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNeil Fuller <nfuller@google.com>2019-05-08 18:49:05 +0100
committerNeil Fuller <nfuller@google.com>2019-06-24 08:47:58 +0000
commit5bc6cc2d427807a81dec80e38b5861daeb282879 (patch)
treea5a3730ca6d7f274b9279d19a7290f6dd5ecb7ca
parentbd2ec35091aabb0eae3b0ea039ffcc23f997e7ad (diff)
downloadparameter-framework-5bc6cc2d427807a81dec80e38b5861daeb282879.tar.gz
Switch host variant to using ICU direct
Switch host library variants to using ICU direct; libandroidicu should only be used on device. Bug: 130787951 Test: build only Change-Id: I904dd208aff547bf3a6c839344aa4052a1ba5641 Merged-In: I95b6a72c72161c8267786790de7093d8a641c392
-rw-r--r--Android.bp12
1 files changed, 11 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp
index dfb8a75..e4d9df1 100644
--- a/Android.bp
+++ b/Android.bp
@@ -93,7 +93,6 @@ cc_library_shared {
],
shared_libs: [
"libremote-processor",
- "libandroidicu",
],
static_libs: [
"libpfw_utility",
@@ -182,6 +181,17 @@ cc_library_shared {
"upstream/xmlserializer/XmlStreamDocSink.cpp",
"upstream/parameter/CommandHandlerWrapper.cpp",
],
+ target: {
+ android: {
+ shared_libs: ["libandroidicu"],
+ },
+ host: {
+ shared_libs: [
+ "libicui18n",
+ "libicuuc",
+ ],
+ },
+ },
}
cc_binary {