DO NOT MERGE - Merge Android 13

Bug: 242648940
Merged-In: I5d2fc94a1ef4d2b8be7a7aede9ea05829f09eaea
Change-Id: If09dac3473605b67b0ca7365b337d8b76382f4c5

6 files changed, 112 insertions, 0 deletions

diff --git a/apex/Android.bp b/apex/Android.bp
index 1569a65..27e28a5 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -44,6 +44,28 @@ android_app_certificate {
 }
 
 apex_vndk {
+    name: "com.android.vndk.v33",
+    manifest: "apex_manifest.v33.json",
+    key: "com.android.vndk.v33.key",
+    certificate: ":com.android.vndk.v33.certificate",
+    vndk_version: "33",
+    system_ext_specific: true,
+    file_contexts: ":com.android.vndk-file_contexts",
+    updatable: false,
+}
+
+apex_key {
+    name: "com.android.vndk.v33.key",
+    public_key: "com.android.vndk.v33.pubkey",
+    private_key: "com.android.vndk.v33.pem",
+}
+
+android_app_certificate {
+    name: "com.android.vndk.v33.certificate",
+    certificate: "com.android.vndk.v33",
+}
+
+apex_vndk {
     name: "com.android.vndk.v32",
     manifest: "apex_manifest.v32.json",
     key: "com.android.vndk.v32.key",
diff --git a/apex/apex_manifest.v33.json b/apex/apex_manifest.v33.json
new file mode 100644
index 0000000..28bd8c8
--- /dev/null
+++ b/apex/apex_manifest.v33.json
@@ -0,0 +1,4 @@
+{
+  "name": "com.android.vndk.v33",
+  "version": 1
+}
diff --git a/apex/com.android.vndk.v33.pem b/apex/com.android.vndk.v33.pem
new file mode 100644
index 0000000..a952b99
--- /dev/null
+++ b/apex/com.android.vndk.v33.pem
@@ -0,0 +1,51 @@
+-----BEGIN RSA PRIVATE KEY-----
+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
+-----END RSA PRIVATE KEY-----
diff --git a/apex/com.android.vndk.v33.pk8 b/apex/com.android.vndk.v33.pk8
new file mode 100644
index 0000000..2185c01
--- /dev/null
+++ b/apex/com.android.vndk.v33.pk8
diff --git a/apex/com.android.vndk.v33.pubkey b/apex/com.android.vndk.v33.pubkey
new file mode 100644
index 0000000..4ef7164
--- /dev/null
+++ b/apex/com.android.vndk.v33.pubkey
diff --git a/apex/com.android.vndk.v33.x509.pem b/apex/com.android.vndk.v33.x509.pem
new file mode 100644
index 0000000..49f645e
--- /dev/null
+++ b/apex/com.android.vndk.v33.x509.pem
@@ -0,0 +1,35 @@
+-----BEGIN CERTIFICATE-----
+MIIGHzCCBAegAwIBAgIUT776g8b5ylngHIv1zn7h/CDgJ+wwDQYJKoZIhvcNAQEL
+BQAwgZ0xCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQH
+DA1Nb3VudGFpbiBWaWV3MRAwDgYDVQQKDAdBbmRyb2lkMRAwDgYDVQQLDAdBbmRy
+b2lkMRkwFwYDVQQDDBBjb20uYW5kcm9pZC52bmRrMSIwIAYJKoZIhvcNAQkBFhNh
+bmRyb2lkQGFuZHJvaWQuY29tMCAXDTIyMDYwNzA2MDEyMloYDzQ3NjAwNTAzMDYw
+MTIyWjCBnTELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNV
+BAcMDU1vdW50YWluIFZpZXcxEDAOBgNVBAoMB0FuZHJvaWQxEDAOBgNVBAsMB0Fu
+ZHJvaWQxGTAXBgNVBAMMEGNvbS5hbmRyb2lkLnZuZGsxIjAgBgkqhkiG9w0BCQEW
+E2FuZHJvaWRAYW5kcm9pZC5jb20wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIK
+AoICAQCZYHiZqo6oAiJiR/mZo6+p6cnjfxLXx4khOhROsS0o1D2IV/Gq/dxhFyYc
+2k9IeIA2chyxZJaVx4LyMnDZ1df97/1LVsFHMk6F5iKs6p2+4dWcMSuvn5L4+Tuf
+wT+h+2KfbpPJpqPEWSmI9VsUp1V10OmxuRELx/kJHQID6IAYiiEVoXHtE1pAO2ip
+NLWXlpVmImGZBr7vPGbLBw+ud3agBLqB3y5jhsUeHseM6uvEbsS2Cd9VJUGK321v
+jsj64pduJdkGOiQBGvS0CwGQjpA3XtlgQUnmUCwramnRW882crsAK9tDMAlQsHdC
+joMH5Umhs7j3wRc5mn4cCjCUzJqK4QwNAKOTrDx9uOwT/Ic5c+h60hOCuk85+Itv
+n79BTbigvanEFwvgur71EJVsaxlXLxJ1xq4IzLpYwW0ty7SErEUXzeJ5kxEgQtNf
+zxxpH8CCSNrLVWkMM4V4wHeKv3C8SHV0hMsxiyIeMJOd/jQ5vC7HTO37gCjuhvOp
+64YGITbW2JDBFMGpBGtiUX4ujosgnBan21SCO+Ws6bKzCzkFgNPNFSrqimer0UK3
+5gQSRQ5YZdytyx5ZoTUKc2KTZ0GeOCUDo/1NSGQLcbZXcJd+/rjVIO+ZyjV0PIUb
+V0NYLWG7Nm+RW14vIg5wP9YdvdHZ4hnApiDDD2aeQBrIchEeuwIDAQABo1MwUTAd
+BgNVHQ4EFgQUdb99aEm8AfYdB+HhqHgshGxSOh8wHwYDVR0jBBgwFoAUdb99aEm8
+AfYdB+HhqHgshGxSOh8wDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOC
+AgEAYd1AQtRiHuUmkvZx4XZ6YnqLEqxqPbf5Z15WJiwgk6xET14bTMEHd2l/qNOq
+rAoxmuyTxWG+OvBpTKBbhftd44xRbg7vF/VX+5LHOcDXpNzLr6JaLMkjR/r63gh5
+8e21WVN1CPqNMqlUHz9ycGTOp/fVh2mRS1kyuBMO742aGtbowlS7otvgdKh8LHxc
+8MRAoJe8ofwQq4nCYAoW8oJ9mnhavSdOGfItxjg62SJGNDMCH/NNPMg1KGpAenlS
+0YZVEZyirJLJtnf4mBdeyLqZMtAWwwTDTAbISu+1YU1BgKCHcQJ/6fdg8iQ/remo
+P8o2HiyUx07Wq5CUFdlIe3y7yW8OYSDkFQa5Gjwh5xoun0icgUjbx8EcxJ04L9Bo
+UEAJJT63XmpjFK7KEM9FBqO6VvXtZlgfgRHRB3wum8mUhPTRgdgKgvs+lBfuHsJA
+Kp5CN5T4A1HZTUHbOGf2iR3ODn6R5DIW5AqcK5KfHvRPcQWRy2JQgYobjtfNJ6fS
+R+xe5O6LJVzQ1cUx2u8Z063Kok1NyPRYoswRdH+GmtfOHRx+RlJVDnAPTrAgtV1S
+Ebo15xkXy6vy0yAoVSZdgLtQaI/6tZXWi8I06I5CWD2X3zbbKd9Ze+nF0YAm2KfF
+Na+CCwOFNmBHceqs6+1SAibch4R5b04S8qi8nXltUvgYH44=
+-----END CERTIFICATE-----