Start using apex_defaults for the tzdata module
am: cd2a1478f8
Change-Id: I52ed99b4b9d01a79156de4aab358c88a7ca43e59
diff --git a/apex/Android.bp b/apex/Android.bp
index 585b5c9..b5902e4 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -12,15 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-apex {
- name: "com.android.tzdata",
- manifest: "manifest.json",
- prebuilts: [
- "apex_tz_version",
- "apex_tzlookup.xml",
- "apex_tzdata",
- "apex_icu_tzdata.dat",
- ],
+// Defaults shared between real and test versions of the APEX.
+apex_defaults {
+ name: "com.android.tzdata-defaults",
+
+ // Explicit because the defaulting behavior only works for the real
+ // module.
+ file_contexts: "com.android.tzdata",
+
+ // Shared signing information.
key: "apex.tzdata.key",
certificate: "com.android.tzdata",
}
@@ -31,3 +31,16 @@
private_key: "com.android.tzdata.pem",
}
+// The definition for the real (not test) tzdata APEX.
+apex {
+ name: "com.android.tzdata",
+ defaults: ["com.android.tzdata-defaults"],
+ manifest: "manifest.json",
+ prebuilts: [
+ "apex_tz_version",
+ "apex_tzlookup.xml",
+ "apex_tzdata",
+ "apex_icu_tzdata.dat",
+ ],
+}
+
diff --git a/testing/data/test1/apex/Android.bp b/testing/data/test1/apex/Android.bp
index af02a74..c405f63 100644
--- a/testing/data/test1/apex/Android.bp
+++ b/testing/data/test1/apex/Android.bp
@@ -18,19 +18,17 @@
// data.
apex {
name: "test1_com.android.tzdata",
+ defaults: ["com.android.tzdata-defaults"],
manifest: "manifest.json",
- file_contexts: "com.android.tzdata",
prebuilts: [
"apex_tz_version_test1",
"apex_tzlookup.xml_test1",
"apex_tzdata_test1",
"apex_icu_tzdata.dat_test1",
],
- key: "apex.tzdata.key",
// installable: false as we do not want test APEX versions in the system
// image.
installable: false,
- certificate: "com.android.tzdata",
}