commit 2549979ae5b93be2db86f6bf4ab320e219151c63
author Neil Fuller <nfuller@google.com> Wed Dec 05 16:52:01 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Dec 05 16:52:01 2018 +0000
tree 5e6d1d4247a55340d26b1a3e6c6a7d77c55e38ae
parent d29ed5628cefb298bc058186268fea591b869bb9
parent 3ac96dea015b0b208d1859342d7820df95750a0e

Merge "Tweak the location of the tz module ICU file"

output_data/Android.bp

diff --git a/output_data/Android.bp b/output_data/Android.bp
index 2f38cc0..205dd0e 100644
--- a/output_data/Android.bp
+++ b/output_data/Android.bp
@@ -39,6 +39,7 @@
     src: "icu_overlay/icu_tzdata.dat",
     notice: "icu_overlay/LICENSE",
     filename: "icu_tzdata.dat",
+    sub_dir: "icu",
     installable: false,
 }
 

testing/data/test1/output_data/Android.bp

diff --git a/testing/data/test1/output_data/Android.bp b/testing/data/test1/output_data/Android.bp
index ecd6c30..af56e60 100644
--- a/testing/data/test1/output_data/Android.bp
+++ b/testing/data/test1/output_data/Android.bp
@@ -39,6 +39,7 @@
     src: "icu_overlay/icu_tzdata.dat",
     notice: "icu_overlay/LICENSE",
     filename: "icu_tzdata.dat",
+    sub_dir: "icu",
     installable: false,
 }