diff options
| author | Neil Fuller <nfuller@google.com> | 2018-12-06 15:12:52 +0000 |
|---|---|---|
| committer | Neil Fuller <nfuller@google.com> | 2018-12-07 12:02:38 +0000 |
| commit | a886dab5e9ec02b6258b69abc992a377e98cf1cd (patch) | |
| tree | 9d45efb9e530059442f02f7d9e3fb8b2ec72f5bc /build | |
| parent | 69431d3ba1c560f0b23bd2ad6257949deb679aa7 (diff) | |
| download | art-a886dab5e9ec02b6258b69abc992a377e98cf1cd.tar.gz art-a886dab5e9ec02b6258b69abc992a377e98cf1cd.tar.bz2 art-a886dab5e9ec02b6258b69abc992a377e98cf1cd.zip | |
Duplicate small time zone files in runtime apex
Add the smaller time zone files into the runtime apex
in addition to /system so we can flush out issues and
start referring to the new location in code.
This doesn't remove anything from /system so should be
relatively safe.
ICU's file will be moved rather than duplicated because
it's a lot larger.
Bug: 119293618
Bug: 119390260
Bug: 113373927
Test: build only
Change-Id: I772842884e833cb9f7bba84bfce805a9b9180d88
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 f1a21e8428..305616a98e 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_binaries = [ "dexdiag", @@ -104,7 +111,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", } @@ -132,6 +140,7 @@ 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", } |