summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Neil Fuller <nfuller@google.com> 2018-12-11 14:03:28 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2018-12-11 14:03:28 +0000
commita93e0f61b14239c58e3168e7d1285819d9047906 (patch)
treea936bca2a25bac8509cf1b9d2ed14705ee63d7e1
parent889e29aae6a7cbd3c6f8dae44f67e054e083a8b6 (diff)
parent3b2319008cb95051dfeef3422c463db290fb0c23 (diff)
Merge "Add ICU's .dat to the runtime APEX"
-rw-r--r--build/apex/Android.bp9
1 files changed, 5 insertions, 4 deletions
diff --git a/build/apex/Android.bp b/build/apex/Android.bp
index f2e12f6a77..0847543acc 100644
--- a/build/apex/Android.bp
+++ b/build/apex/Android.bp
@@ -48,11 +48,12 @@ art_runtime_debug_native_shared_libs = [
"libadbconnectiond",
]
-// Files associated with bionic / managed core library time zone APIs.
-art_runtime_time_zone_prebuilts = [
+// Data files associated with bionic / managed core library APIs.
+art_runtime_data_file_prebuilts = [
"apex_tz_version",
"apex_tzdata",
"apex_tzlookup.xml",
+ "apex_icu.dat",
]
// Modules listed in LOCAL_REQUIRED_MODULES for module art-tools in art/Android.mk.
@@ -116,7 +117,7 @@ apex {
binaries: [],
}
},
- prebuilts: art_runtime_time_zone_prebuilts
+ prebuilts: art_runtime_data_file_prebuilts
+ ["com.android.runtime.ld.config.txt"],
key: "com.android.runtime.key",
}
@@ -145,7 +146,7 @@ apex {
binaries: art_tools_binaries,
}
},
- prebuilts: art_runtime_time_zone_prebuilts
+ prebuilts: art_runtime_data_file_prebuilts
+ ["com.android.runtime.ld.config.txt"],
key: "com.android.runtime.key",
}