Merge "Change art-test build module names and dirs"
am: 00ca93af60
Change-Id: I3d668b48a59dc4d9277acbd68d41b3d1e844002f
diff --git a/output_data/android/Android.bp b/output_data/android/Android.bp
index 31c2216..d79a7fc 100644
--- a/output_data/android/Android.bp
+++ b/output_data/android/Android.bp
@@ -22,8 +22,17 @@
// TODO(b/121117762, b/129332183): Remove this module definition when
// the ART Buildbot and Golem have full support for the Runtime APEX.
prebuilt_etc {
- name: "tzlookup.xml-art-test",
+ name: "tzlookup.xml-art-test-runtime",
src: "tzlookup.xml",
filename_from_src: true,
sub_dir: "tz",
}
+
+// TODO(b/121117762, b/129332183): Remove this module definition when
+// the ART Buildbot and Golem have full support for the Time Zone Data APEX.
+prebuilt_etc {
+ name: "tzlookup.xml-art-test-tzdata",
+ src: "tzlookup.xml",
+ filename_from_src: true,
+ sub_dir: "tzdata_module/etc/tz",
+}
diff --git a/output_data/iana/Android.bp b/output_data/iana/Android.bp
index b96ae16..4eb8dab 100644
--- a/output_data/iana/Android.bp
+++ b/output_data/iana/Android.bp
@@ -44,8 +44,17 @@
// TODO(b/121117762, b/129332183): Remove this module definition when
// the ART Buildbot and Golem have full support for the Runtime APEX.
prebuilt_etc {
- name: "tzdata-art-test",
+ name: "tzdata-art-test-runtime",
src: "tzdata",
filename_from_src: true,
sub_dir: "tz",
}
+
+// TODO(b/121117762, b/129332183): Remove this module definition when
+// the ART Buildbot and Golem have full support for the Time Zone Data APEX.
+prebuilt_etc {
+ name: "tzdata-art-test-tzdata",
+ src: "tzdata",
+ filename_from_src: true,
+ sub_dir: "tzdata_module/etc/tz",
+}
diff --git a/output_data/icu_overlay/Android.bp b/output_data/icu_overlay/Android.bp
new file mode 100644
index 0000000..bd2856d
--- /dev/null
+++ b/output_data/icu_overlay/Android.bp
@@ -0,0 +1,28 @@
+// Copyright (C) 2019 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Module definition producing a tzdata prebuilt file in
+// /system/etc/tzdata_module/etc/tz for standalone ART testing purposes.
+// This is a temporary change needed until the ART Buildbot and Golem both fully
+// support the Time Zone Data APEX (see b/121117762). This module should never
+// be shipped by default (i.e. should never be part of `PRODUCT_PACKAGE`.)
+
+// TODO(b/121117762, b/129332183): Remove this module definition when
+// the ART Buildbot and Golem have full support for the Time Zone Data APEX.
+prebuilt_etc {
+ name: "icu_overlay-art-test-tzdata",
+ src: "icu_tzdata.dat",
+ filename_from_src: true,
+ sub_dir: "tzdata_module/etc/icu",
+}
diff --git a/output_data/version/Android.bp b/output_data/version/Android.bp
index 4fea9dd..4473053 100644
--- a/output_data/version/Android.bp
+++ b/output_data/version/Android.bp
@@ -43,8 +43,17 @@
// TODO(b/121117762, b/129332183): Remove this module definition when
// the ART Buildbot and Golem have full support for the Runtime APEX.
prebuilt_etc {
- name: "tz_version-art-test",
+ name: "tz_version-art-test-runtime",
src: "tz_version",
filename_from_src: true,
sub_dir: "tz",
}
+
+// TODO(b/121117762, b/129332183): Remove this module definition when
+// the ART Buildbot and Golem have full support for the Time Zone Data APEX.
+prebuilt_etc {
+ name: "tz_version-art-test-tzdata",
+ src: "tz_version",
+ filename_from_src: true,
+ sub_dir: "tzdata_module/etc/tz",
+}
