Merge "Build an apex shim with different certificate"
diff --git a/shim/build/Android.bp b/shim/build/Android.bp
index 68abb9a..da03dbc 100644
--- a/shim/build/Android.bp
+++ b/shim/build/Android.bp
@@ -154,6 +154,7 @@
":com.android.apex.cts.shim.v2",
":com.android.apex.cts.shim.v2_additional_file",
":com.android.apex.cts.shim.v2_additional_folder",
+ ":com.android.apex.cts.shim.v2_different_certificate",
":com.android.apex.cts.shim.v2_with_pre_install_hook",
":com.android.apex.cts.shim.v2_with_post_install_hook",
":com.android.apex.cts.shim.v3",
@@ -208,3 +209,19 @@
prebuilts: ["hash_of_dev_null"],
installable: false,
}
+
+apex {
+ name: "com.android.apex.cts.shim.v2_different_certificate",
+ manifest: "manifest_v2.json",
+ androidManifest: "AndroidManifest.xml",
+ file_contexts: "apex.test",
+ key: "com.android.apex.cts.shim.key",
+ prebuilts: ["hash_of_dev_null"],
+ installable: false,
+ certificate: ":com.android.apex.cts.shim.debug.cert",
+}
+
+android_app_certificate {
+ name: "com.android.apex.cts.shim.debug.cert",
+ certificate: "com.android.apex.cts.shim.debug.cert",
+}
diff --git a/shim/build/com.android.apex.cts.shim.debug.cert.pk8 b/shim/build/com.android.apex.cts.shim.debug.cert.pk8
new file mode 100644
index 0000000..2f72cba
--- /dev/null
+++ b/shim/build/com.android.apex.cts.shim.debug.cert.pk8
Binary files differ
diff --git a/shim/build/com.android.apex.cts.shim.debug.cert.x509.pem b/shim/build/com.android.apex.cts.shim.debug.cert.x509.pem
new file mode 100644
index 0000000..45aaeff
--- /dev/null
+++ b/shim/build/com.android.apex.cts.shim.debug.cert.x509.pem
@@ -0,0 +1,32 @@
+-----BEGIN CERTIFICATE-----
+MIIFbTCCA1WgAwIBAgIUUCHZSiUxmGoHHBjoBxL+dEHkKykwDQYJKoZIhvcNAQEL
+BQAwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoM
+GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDAgFw0xOTA3MjIxNjE5NTRaGA80NzU3
+MDYxNzE2MTk1NFowRTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUx
+ITAfBgNVBAoMGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDCCAiIwDQYJKoZIhvcN
+AQEBBQADggIPADCCAgoCggIBAK/UZPpq8sZfYtHiF6nkLhcUkEihGzYde+IcYGYH
+iDltvjBJ/Q96VGblvxJRMdE2Kf2MCIut5iOiDkVrPZ3C+Uwi/mRuD9YxYxFc0apH
+1YiVPV+PuiLwQ0cZAb/1B+F+ZcvS7tIn7e012XK0eZeGGPZF+d7iL9m1iRZAIMB6
+9nNgpL/QkXZZpNolQb/9S9Fv7mpZrHxIR2d6nsgkac9qQywzsNBkPnXqpBqm6YnE
+kBvu0fUX1PR8RIfznyz9PL1KE1yKltKLWo5xPFTiOrO/70Q3d5jOivv+JjfyS9NK
+1t0J/fAafkFD70glaipDdYaABJ3pDATOfP06449dLOWex6Bl30XSO+0vy1ioFVn9
+OkgpsaNXQVpVEAXBIuBARWRMvd2xfSIjCXxDI+Od3g/BpNx0ZZJRcF8zmQxVcO0Y
+ydMMj7MZ1AMcml5Zdx8+Lfcq8DBUCGcgNDwS8hTtDWhSy3OupoULgoFTbLu2F9+p
+Hr5PIGFjaaYibwQ+1njQVqkdBe5NwDYDPigwgyQnM7UEPskqakRPbTqWDYyXGNTb
+vmzOsiz9EYxKfv+Jm3dwA41LwObqlhT+4KZ9X4l56WKgimBAAOG3HenLaAkIDMhP
+wgGNazW6lP1cCziT4+BKR91SdgJ6YwLet1qC881IWzQUi+yG29hocKp7vLfQ4Qhp
+qwRnAgMBAAGjUzBRMB0GA1UdDgQWBBSdv0SnZzaUVL4S/ghkZNxb+Pb+LDAfBgNV
+HSMEGDAWgBSdv0SnZzaUVL4S/ghkZNxb+Pb+LDAPBgNVHRMBAf8EBTADAQH/MA0G
+CSqGSIb3DQEBCwUAA4ICAQAeMQ/tDU2TpH72FKQtkFb5sPXoaFl5QcOYZqgjcivf
+l+Za3oVnFoYUITGjd/fyULHxKx7MUCK3jmZh9A9NTShPRyaZAv3EzSOOG9XAIoBk
+Kq+bUcHdmg8OFws9aeHGnImSZNEGIoFSe4YXcrYCxMiPvo7AOwNakhaIP0th4xfw
+lIGCJ1OMhPSEA9PrIeugKxEX8vNbxc9hocn2MpGD7+0NvhJbXQ6SPRPI3fhdCYZ/
+YaaTzGWMAJEbuMK2Nk4zk8vdFgCKT7OfRXCHhLrxmHf/IymE2oSxqDW4VLtA8z48
+upF9wFTG0IVV6NBylsxaxSdZ7SkxK1fzPnzMPOUVvSKUDQ+JtWuCNjJOQ8jdyfn0
+z8zdx9GRQDl69ABY0fKDx6ToOeifAz5tvgGL35RwN3Scq87kBgd+mV54OY/zjxLX
+R93NeCH94VtDNreSgQn1qrSoWW5bo+ycETkumNilWiczGw753Xeo7NerWHxodeVK
+bAd5PpGjU7PaqllVB9u635v4UsrtVq4u/bIR3ZXpwIO8fL2IOl7pQw7e5Q8ZYTu4
+M7OMCICl5dvI4Pqoqb0AkejGvE9O3TadoxO0NTUPt85vF9CKo0hTGioLdnaGWKLO
+96Fh/Pre8s2WPP8c71YUlczPV/jqjBZtVSU22fD+TRfeko+T0z4LOuBxFBhjxm2R
+Og==
+-----END CERTIFICATE-----
