Merge "DO NOT MERGE - Skip pi-platform-release (PPRL.190205.001) into stage-aosp-master" into stage-aosp-master
diff --git a/apex/Android.bp b/apex/Android.bp
index 585b5c9..076de0c 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -12,17 +12,17 @@
// 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",
+ certificate: ":com.android.tzdata.certificate",
}
apex_key {
@@ -31,3 +31,20 @@
private_key: "com.android.tzdata.pem",
}
+android_app_certificate {
+ name: "com.android.tzdata.certificate",
+ certificate: "com.android.tzdata",
+}
+
+// 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/apex/com.android.tzdata.pk8 b/apex/com.android.tzdata.pk8
new file mode 100644
index 0000000..f786710
--- /dev/null
+++ b/apex/com.android.tzdata.pk8
Binary files differ
diff --git a/apex/com.android.tzdata.x509.pem b/apex/com.android.tzdata.x509.pem
new file mode 100644
index 0000000..bf78bee
--- /dev/null
+++ b/apex/com.android.tzdata.x509.pem
@@ -0,0 +1,34 @@
+-----BEGIN CERTIFICATE-----
+MIIFzjCCA7agAwIBAgIJAIyjs8l5WRp5MA0GCSqGSIb3DQEBCwUAMHsxCzAJBgNV
+BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1Nb3VudGFpbiBW
+aWV3MRAwDgYDVQQKDAdBbmRyb2lkMRAwDgYDVQQLDAdBbmRyb2lkMRswGQYDVQQD
+DBJjb20uYW5kcm9pZC50emRhdGEwIBcNMTkwMTI1MTY0ODE0WhgPNDc1NjEyMjEx
+NjQ4MTRaMHsxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYD
+VQQHDA1Nb3VudGFpbiBWaWV3MRAwDgYDVQQKDAdBbmRyb2lkMRAwDgYDVQQLDAdB
+bmRyb2lkMRswGQYDVQQDDBJjb20uYW5kcm9pZC50emRhdGEwggIiMA0GCSqGSIb3
+DQEBAQUAA4ICDwAwggIKAoICAQC3PzY5waM71QpWUVQPfTrtCf9Mx9097DjM6RlD
+jaOd2FtN7gUN/d+z19h0WRkBcBMDWH3z4aHIDp4YXABIdqIzXehhdCFLro4W6H4I
+TNcbH6/M4rmtGs2v0zCkrr8z/mEasCdsw9iz8LOiyouGxgt0Q2qPSQ3OcbZSGX0C
+T8VNxDIP1RpQdRUKhZt/hsmcuPHGq64yil/i7FHX4dLgjnik4sUkHPsQTam/H/J/
+brl9OToTCyRuTgaq6EfxCZVXPfxQE6KTDchFr4wYSbxIgSN9zk2wPLXCsyvSb2lV
+fDSbkRmS89cCaCArF3SP3FAKoZdxdNtT1Q/KayMs7c/jrhFloiIpkstNCzMrPT9i
+j5QwRqcBscSijqaEJOyK458EhaO7m3GHc9e+1afsxTIn//vbrpJU7ewOiwcAsJAT
+KGFMotbK1fV4jGCzKxDVBd1OP5yN/iPYS8INH4tt1W1Q5jaQn/Uy+RuS1tPZTtrL
+ldj/QJ/K9XNSg4v12hXlLDwUlwEMu2Akbe6BYItfhdAEITRr332l6e466cQDp3V2
+mOWANPEX35s5/CaxeqJOi3Y+DSx4iwjOKiormnnEalRFAZrSDU2UNxIqrmidl03Y
+/0p13ugbPmJbpXFPZFDPsUuvPuGLSAU2luUuFSgT0FVyWj5BfzFmcuLxQom03+ds
+cX8GxQIDAQABo1MwUTAdBgNVHQ4EFgQUVCZf+AGkP1wMi7C0l6FFefk9kVAwHwYD
+VR0jBBgwFoAUVCZf+AGkP1wMi7C0l6FFefk9kVAwDwYDVR0TAQH/BAUwAwEB/zAN
+BgkqhkiG9w0BAQsFAAOCAgEAc0NA+Ya/L5Vs+8CZ/5rP6dIbzbgL7tm1nmjU65jY
+8znsSrB0JDTEHCLc+9u35YU77Z3sW9lFE9el1i693gYQnYSy1lducHHKzbnss2/f
++DJ4QExrPR+PfnkSxdjL8+MXVAtVZDCeEBTcUgLES6m4WLS9hKL4+Oe+igXkAJA+
+d8w1/5ASuood3cTNy3nxssdueAKl4Tyj0y0zejoVlznaYw4zMTmlnrz1l0ZbaKiM
+tr52U2kASEVQW6EhiielsLMzDngqAQ49FQriv7oUhrlbmP3+CkhhPWbM3keSHm/a
+vIQGD3+mbJpekuRgC5w1nCborCxpnHoZUXMyb6/3PnY9u4O8VT5rY5NipVfL/Cvu
+12w0kvcuXTP58gvOJANB5t8Jo4tctG99hO0ECr7/439YM4NMkL5nYEcJe3DemquB
+pB7xVBAD7WKEcB5KV/oDXoLjxMlassKSAvBVbx+fvbGIW6k1pe3uiHl8p/zvxoNb
+9FFRoElCyuzzVP5r/kN5uNbPVIexbVET4elOcUhKigHWZHYv/PQ9ncpA8tbDeAIr
+vzoofKWv4r4tyQZLR4YnEYTGBORO6rX//Mcg8zKE6vXb0zKLW5vW1zxv31q1p2lC
+0R5e4ix7UjR8OJcBCnyKuqSRdCIpMitam2V+BXwh/7mLZBA4LuV4koNofVaBFxlt
+BCo=
+-----END CERTIFICATE-----
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",
}