Mark ab/6881855 as merged
Bug: 172690556
Change-Id: I0caccefb77d67a6b763189d1cd4a8e9b92589cbb
diff --git a/apex/Android.bp b/apex/Android.bp
index d2e87a7..65797da 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -99,24 +99,3 @@
name: "com.android.vndk.v28.certificate",
certificate: "com.android.vndk.v28",
}
-
-apex_vndk {
- name: "com.android.vndk.v27",
- manifest: "apex_manifest.v27.json",
- key: "com.android.vndk.v27.key",
- certificate: ":com.android.vndk.v27.certificate",
- vndk_version: "27",
- system_ext_specific: true,
- file_contexts: ":com.android.vndk-file_contexts",
-}
-
-apex_key {
- name: "com.android.vndk.v27.key",
- public_key: "com.android.vndk.v27.pubkey",
- private_key: "com.android.vndk.v27.pem",
-}
-
-android_app_certificate {
- name: "com.android.vndk.v27.certificate",
- certificate: "com.android.vndk.v27",
-}
diff --git a/apex/apex_manifest.v27.json b/apex/apex_manifest.v27.json
deleted file mode 100644
index 13b488e..0000000
--- a/apex/apex_manifest.v27.json
+++ /dev/null
@@ -1,6 +0,0 @@
-
-{
- "name": "com.android.vndk.v27",
- "version": 1
-}
-
diff --git a/apex/com.android.vndk.v27.pem b/apex/com.android.vndk.v27.pem
deleted file mode 100644
index 346b857..0000000
--- a/apex/com.android.vndk.v27.pem
+++ /dev/null
@@ -1,51 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-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
------END RSA PRIVATE KEY-----
diff --git a/apex/com.android.vndk.v27.pk8 b/apex/com.android.vndk.v27.pk8
deleted file mode 100644
index 9c7ead2..0000000
--- a/apex/com.android.vndk.v27.pk8
+++ /dev/null
Binary files differ
diff --git a/apex/com.android.vndk.v27.pubkey b/apex/com.android.vndk.v27.pubkey
deleted file mode 100644
index 0b305f8..0000000
--- a/apex/com.android.vndk.v27.pubkey
+++ /dev/null
Binary files differ
diff --git a/apex/com.android.vndk.v27.x509.pem b/apex/com.android.vndk.v27.x509.pem
deleted file mode 100644
index a32d107..0000000
--- a/apex/com.android.vndk.v27.x509.pem
+++ /dev/null
@@ -1,32 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFbTCCA1WgAwIBAgIUIYU/sFDeuYyFYhKwV+sm0IyuKyAwDQYJKoZIhvcNAQEL
-BQAwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoM
-GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDAgFw0xOTA5MDkwNzQzMzVaGA80NzU3
-MDgwNTA3NDMzNVowRTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUx
-ITAfBgNVBAoMGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDCCAiIwDQYJKoZIhvcN
-AQEBBQADggIPADCCAgoCggIBAK2jk0zDmAWqzKBFZgDzd1J2ZXpfq0Vuh8hOXOtu
-TinyLdpz8uZorfyR8SJ0QNhC4l0OYcXQRxThSOQM8H/92c4jyXiwTOjmCjtryd/3
-9+Z2LyOhGCUI5l2s5Sfkx547NQAjLTPhLYgOsq3SPRQDo/k9EU50vZ7TzA3tn3HM
-kL1sE/kAvNi10dHIQqJS9M8KqxHf/ZP+CSU+Yg8Vo+mG6yF1Cjlr43+d8JTkn8qd
-CdEhmykjpPswjHspgTsf/YJpatTZi/39OJn41rV9WYc7W8sRowzVUh32tJ9BX5LS
-iBqfajNr2iHAmModjoQFiH4PzumpZQxRIg8RkAPCjyE94Fs32TuApvAHl/ick0Go
-SqnJMXHXHT+W0EtGBGJM2lj1JuSZO1U5co1BKfCKCPSSLd6xeARChA4f9JjXP9LS
-C/uthws/Todz5MAEca7JcwmgR7tqxRyIWbloM/h+iHCi8vRf3831ADnn81YJvP9X
-hNde/w7bnx1DbNFLPwu0RbtEKN7ZJCvRsfuTDSW+7u1cPDq8p/dX4dvqZntyX0KQ
-7OTk74E29fBkJBycWitMmATN3tWVWmhS4nCr9fLo3KwAuJE/LJ5iorAIkrmU7N+8
-SagRMI7Yaik4TwdpC2Zj20pV00MYZVArEYCpkFEvl18cFvAeXp9W5t43jkeCkE6Y
-/KOFAgMBAAGjUzBRMB0GA1UdDgQWBBSTQmauh+8rf/UUuVVHPrKRsFFT6zAfBgNV
-HSMEGDAWgBSTQmauh+8rf/UUuVVHPrKRsFFT6zAPBgNVHRMBAf8EBTADAQH/MA0G
-CSqGSIb3DQEBCwUAA4ICAQADH6ST7FBN0HJS6hGNujf34Yy47Ds05FCE0PnZYJpx
-32KC8kYow7kmXLOC2NtBnvL1r37dyQhz+CtlNeZ/q1qNbjxiNsy8ePf9m2xe+8sP
-IPf5jFVpX2oLliMJOsJKjA3OGQwI4wcSU8twkeCIzWONcGuYPHQQoX+tNPNaPuEz
-nXC3nOMP45UFwezb+6NaeDHBaeoHycXBKDtpIbYR0LK+AD4XwkX53cu5aivHtPFe
-Fz6MVl9XggaPpUZczgml0UBS2WbrwZ0liVcsWt8ERmheaLz/2B67AISfT5JeKRSR
-CwMuz5oRA2p2brJ3L8l/YRznEX5+XXeQAdGfaGgXZM7hTzgFI4MOjxZNSJ6X+hc0
-y+xiMwNt0ssmv7W04swtA9dy0gwFHzCgNOblBXig/sRPWDIaXdSipwQeKiu/6E1z
-Bn/VX+rAW577GbOZ2yA+/azG6x1FqzW9ighf7yH69UkSQRTWpe6PwBMjFN+azjuD
-ILCG4Karw4lGewrjNfzM5gIEUmsXUtIjj/YgcUxFbeqWWeidWvgLn8ki86IFPXU0
-HFqZjDpXduFGwUje/u8xiJEPD6AlWGehEIaUNqzDieDmljWYgclVZkOrfm/9ZhZA
-cpHI33Ysr9DfsdSoRhqlDxu/wQ9GTj+17xyX2zmRrCtGzFOuHaTkDDO6OXJdCi69
-BA==
------END CERTIFICATE-----
