diff options
| author | Neil Fuller <nfuller@google.com> | 2018-12-08 16:39:18 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-12-08 16:39:18 +0000 |
| commit | c4252f49a035dca5adfbb4f39d3cede9f93dff7e (patch) | |
| tree | 2bf14da48d0a63aee438d5b53810275ef9a2df1b /build | |
| parent | dcdb0d4e0872fd38561cccbf538e8f3bd1053ef8 (diff) | |
| parent | a886dab5e9ec02b6258b69abc992a377e98cf1cd (diff) | |
| download | art-c4252f49a035dca5adfbb4f39d3cede9f93dff7e.tar.gz art-c4252f49a035dca5adfbb4f39d3cede9f93dff7e.tar.bz2 art-c4252f49a035dca5adfbb4f39d3cede9f93dff7e.zip | |
Merge "Duplicate small time zone files in runtime apex"
Diffstat (limited to 'build')
| -rw-r--r-- | build/apex/Android.bp | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/build/apex/Android.bp b/build/apex/Android.bp index 88178a013e..f2e12f6a77 100644 --- a/build/apex/Android.bp +++ b/build/apex/Android.bp @@ -48,6 +48,13 @@ art_runtime_debug_native_shared_libs = [ "libadbconnectiond", ] +// Files associated with bionic / managed core library time zone APIs. +art_runtime_time_zone_prebuilts = [ + "apex_tz_version", + "apex_tzdata", + "apex_tzlookup.xml", +] + // Modules listed in LOCAL_REQUIRED_MODULES for module art-tools in art/Android.mk. art_tools_common_binaries = [ "dexdiag", @@ -109,7 +116,8 @@ apex { binaries: [], } }, - prebuilts: ["com.android.runtime.ld.config.txt"], + prebuilts: art_runtime_time_zone_prebuilts + + ["com.android.runtime.ld.config.txt"], key: "com.android.runtime.key", } @@ -137,7 +145,8 @@ apex { binaries: art_tools_binaries, } }, - prebuilts: ["com.android.runtime.ld.config.txt"], + prebuilts: art_runtime_time_zone_prebuilts + + ["com.android.runtime.ld.config.txt"], key: "com.android.runtime.key", } |