Snap for 8426163 from 65560bb9e7768b0d449da02c97398414451f07a0 to mainline-tzdata2-releaseandroid-mainline-12.0.0_r112aml_tz2_305400500aml_tz2_305400300aml_tz2_305400100aml_tz2_304500300aml_tz2_303900110aml_tz2_303900102aml_tz2_303800002aml_tz2_303800001aml_tz2_303200001android12-mainline-tzdata2-releaseaml_tz2_305400100

Change-Id: Ieab5fc6b6bfa5bc2e9c8da101046a75610f5b1ba

18 files changed, 199 insertions, 284 deletions

diff --git a/Android.bp b/Android.bp
index 458b0fe..fd71aa3 100644
--- a/Android.bp
+++ b/Android.bp
@@ -12,31 +12,22 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package {
-    default_applicable_licenses: ["Android-Apache-2.0"],
+vndk_libraries_txt {
+  name: "llndk.libraries.txt",
 }
 
-llndk_libraries_txt {
-    name: "llndk.libraries.txt",
+vndk_libraries_txt {
+  name: "vndkcore.libraries.txt",
 }
 
-vndkcore_libraries_txt {
-    name: "vndkcore.libraries.txt",
+vndk_libraries_txt {
+  name: "vndksp.libraries.txt",
 }
 
-vndksp_libraries_txt {
-    name: "vndksp.libraries.txt",
+vndk_libraries_txt {
+  name: "vndkprivate.libraries.txt",
 }
 
-vndkprivate_libraries_txt {
-    name: "vndkprivate.libraries.txt",
-}
-
-vndkproduct_libraries_txt {
-  name: "vndkproduct.libraries.txt",
-}
-
-vndkcorevariant_libraries_txt {
+vndk_libraries_txt {
   name: "vndkcorevariant.libraries.txt",
-  insert_vndk_version: false,
 }
diff --git a/OWNERS b/OWNERS
index fd19602..091dca9 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,4 +1,3 @@
 jiyong@google.com
 jooyung@google.com
-justinyun@google.com
-include platform/packages/modules/common:/MODULES_OWNERS  # see go/mainline-owners-policy
+justinyun@google.com
\ No newline at end of file
diff --git a/apex/Android.bp b/apex/Android.bp
index 602f95f..d6082b6 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -12,18 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package {
-    default_applicable_licenses: ["Android-Apache-2.0"],
-}
-
 apex_vndk {
     name: "com.android.vndk.current",
     manifest: "apex_manifest.current.json",
     key: "com.android.vndk.current.key",
     certificate: ":com.android.vndk.current.certificate",
     file_contexts: ":com.android.vndk-file_contexts",
-    updatable: false,
-    generate_hashtree: false,
 }
 
 override_apex {
@@ -44,28 +38,6 @@ android_app_certificate {
 }
 
 apex_vndk {
-    name: "com.android.vndk.v30",
-    manifest: "apex_manifest.v30.json",
-    key: "com.android.vndk.v30.key",
-    certificate: ":com.android.vndk.v30.certificate",
-    vndk_version: "30",
-    system_ext_specific: true,
-    file_contexts: ":com.android.vndk-file_contexts",
-    updatable: false,
-}
-
-apex_key {
-    name: "com.android.vndk.v30.key",
-    public_key: "com.android.vndk.v30.pubkey",
-    private_key: "com.android.vndk.v30.pem",
-}
-
-android_app_certificate {
-    name: "com.android.vndk.v30.certificate",
-    certificate: "com.android.vndk.v30",
-}
-
-apex_vndk {
     name: "com.android.vndk.v29",
     manifest: "apex_manifest.v29.json",
     key: "com.android.vndk.v29.key",
@@ -73,7 +45,6 @@ apex_vndk {
     vndk_version: "29",
     system_ext_specific: true,
     file_contexts: ":com.android.vndk-file_contexts",
-    updatable: false,
 }
 
 apex_key {
@@ -95,7 +66,6 @@ apex_vndk {
     vndk_version: "28",
     system_ext_specific: true,
     file_contexts: ":com.android.vndk-file_contexts",
-    updatable: false,
 }
 
 apex_key {
@@ -108,3 +78,24 @@ android_app_certificate {
     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/README.md b/apex/README.md
deleted file mode 100644
index e98c63d..0000000
--- a/apex/README.md
+++ /dev/null
@@ -1,65 +0,0 @@
-# Add a new VNDK APEX
-
-In this document we add a new VNDK APEX for version 30. When you follow this doc with different versions,
-change "30" to what you're adding. (eg. 31)
-
-1. Add a new definition in `Android.bp`
-
-```
-apex_vndk {
-    name: "com.android.vndk.v30",
-    manifest: "apex_manifest.v30.json",
-    key: "com.android.vndk.v30.key",
-    certificate: ":com.android.vndk.v30.certificate",
-    vndk_version: "30",
-    system_ext_specific: true,
-    file_contexts: ":com.android.vndk-file_contexts",
-}
-
-apex_key {
-    name: "com.android.vndk.v30.key",
-    public_key: "com.android.vndk.v30.pubkey",
-    private_key: "com.android.vndk.v30.pem",
-}
-
-android_app_certificate {
-    name: "com.android.vndk.v30.certificate",
-    certificate: "com.android.vndk.v30",
-}
-```
-
-2. Add `apex_manifest.v30.json`
-
-```
-{
-  "name": "com.android.vndk.v30",
-  "version": 1
-}
-```
-
-3. Add keys/ceritificate
-
-```
-openssl genrsa -out com.android.vndk.v30.pem 4096
-avbtool extract_public_key --key com.android.vndk.v30.pem --output com.android.vndk.v30.pubkey
-openssl req -x509 -newkey rsa:4096 -nodes -days 999999 -keyout key.pem -out com.android.vndk.v30.x509.pem
-
-# Enter following info via the interactive prompts
-# Country Name: US
-# State: California
-# Locality Name: Mountain View
-# Organization Name: Android
-# Organization Unit Name: Android
-# Common Name: com.android.vndk
-# Email address: android@android.com
-
-openssl pkcs8 -topk8 -inform PEM -outform DER -in key.pem -out com.android.vndk.v30.pk8 -nocrypt
-
-rm key.pem
-```
-
-4. Verify
-
-```
-m com.android.vndk.v30
-```
diff --git a/apex/apex_manifest.v27.json b/apex/apex_manifest.v27.json
new file mode 100644
index 0000000..13b488e
--- /dev/null
+++ b/apex/apex_manifest.v27.json
@@ -0,0 +1,6 @@
+
+{
+  "name": "com.android.vndk.v27",
+  "version": 1
+}
+
diff --git a/apex/apex_manifest.v30.json b/apex/apex_manifest.v30.json
deleted file mode 100644
index 89d1bb8..0000000
--- a/apex/apex_manifest.v30.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "name": "com.android.vndk.v30",
-  "version": 1
-}
\ No newline at end of file
diff --git a/apex/com.android.vndk.current.pem b/apex/com.android.vndk.current.pem
index 8e71ede..85808f4 100644
--- a/apex/com.android.vndk.current.pem
+++ b/apex/com.android.vndk.current.pem
@@ -1,51 +1,51 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----
diff --git a/apex/com.android.vndk.current.pk8 b/apex/com.android.vndk.current.pk8
index 9eaa0da..699dc5e 100644
--- a/apex/com.android.vndk.current.pk8
+++ b/apex/com.android.vndk.current.pk8
diff --git a/apex/com.android.vndk.current.pubkey b/apex/com.android.vndk.current.pubkey
index f408d2b..f4e1d0f 100644
--- a/apex/com.android.vndk.current.pubkey
+++ b/apex/com.android.vndk.current.pubkey
diff --git a/apex/com.android.vndk.current.x509.pem b/apex/com.android.vndk.current.x509.pem
index a6e9352..b085a1f 100644
--- a/apex/com.android.vndk.current.x509.pem
+++ b/apex/com.android.vndk.current.x509.pem
@@ -1,35 +1,32 @@
 -----BEGIN CERTIFICATE-----
-MIIGHzCCBAegAwIBAgIUEuOjVBp4S7TtBUVtVzGaGoNkd5wwDQYJKoZIhvcNAQEL
-BQAwgZ0xCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQH
-DA1Nb3VudGFpbiBWaWV3MRAwDgYDVQQKDAdBbmRyb2lkMRAwDgYDVQQLDAdBbmRy
-b2lkMRkwFwYDVQQDDBBjb20uYW5kcm9pZC52bmRrMSIwIAYJKoZIhvcNAQkBFhNh
-bmRyb2lkQGFuZHJvaWQuY29tMCAXDTIwMTEyNDE5MDkyN1oYDzQ3NTgxMDIxMTkw
-OTI3WjCBnTELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNV
-BAcMDU1vdW50YWluIFZpZXcxEDAOBgNVBAoMB0FuZHJvaWQxEDAOBgNVBAsMB0Fu
-ZHJvaWQxGTAXBgNVBAMMEGNvbS5hbmRyb2lkLnZuZGsxIjAgBgkqhkiG9w0BCQEW
-E2FuZHJvaWRAYW5kcm9pZC5jb20wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIK
-AoICAQDbFMub4ed5bu4Q0xMxoXUXu0FGpCxnmNpX+xBJzyAjBqeAxA3OiwYS9GNy
-SeocBJ2d1f57oArA5iO2vljFjuF5RyK4haGxiVIU7NoTG1NrgBEADMhs870JREYY
-0lG48uIP0/NGYz+FXAK7RukodxMpjfGaFMx1o4YFXVXbE6lYQxnlAj5+Vb/0GSbS
-UthQe+Urdiul+gRDfY+ACXjW1EeA2VE0/27HSfbOqoQ07J0hVer5w6klDXxYTz00
-z0xfvtsX3C0OM/ejK/+45P4kN1z3rkMg2Im5rEyjnArgxJ0zwVzI5LzDCk9dygl3
-r1oE0SmCXvRsx6mMTGYUxgboCIIQ6rrgtWcrtdLSkxzvekMWeayo3OKosx0bpXzP
-zcT2VozAdxE3aQdC1bqb7Lc4qO3XUqIO1r/nZQR8ZdP7mKO0AKnuo18CFnxwjn6x
-lP5R7frZUCJZzRWHjrMOvtZbLDTqPFUnRzheDMUmlak3Gs2IpV+ZWgqEhrNN+zcq
-FgzyOCx61rwfK3LInjcUanWwYhduSZeQqGC9csFfGbA3YFbjj96NcTs3SaMOg5Nw
-EKGiD3DtpM377CBvp+AKJtJhj8Z+BPnik5XgSFNRAlnfZerTz0wXL7i4NTo45JpK
-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
+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
+1w==
 -----END CERTIFICATE-----
diff --git a/apex/com.android.vndk.v27.pem b/apex/com.android.vndk.v27.pem
new file mode 100644
index 0000000..346b857
--- /dev/null
+++ b/apex/com.android.vndk.v27.pem
@@ -0,0 +1,51 @@
+-----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
new file mode 100644
index 0000000..9c7ead2
--- /dev/null
+++ b/apex/com.android.vndk.v27.pk8
diff --git a/apex/com.android.vndk.v27.pubkey b/apex/com.android.vndk.v27.pubkey
new file mode 100644
index 0000000..0b305f8
--- /dev/null
+++ b/apex/com.android.vndk.v27.pubkey
diff --git a/apex/com.android.vndk.v27.x509.pem b/apex/com.android.vndk.v27.x509.pem
new file mode 100644
index 0000000..a32d107
--- /dev/null
+++ b/apex/com.android.vndk.v27.x509.pem
@@ -0,0 +1,32 @@
+-----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-----
diff --git a/apex/com.android.vndk.v30.pem b/apex/com.android.vndk.v30.pem
deleted file mode 100644
index 85808f4..0000000
--- a/apex/com.android.vndk.v30.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.v30.pk8 b/apex/com.android.vndk.v30.pk8
deleted file mode 100644
index 699dc5e..0000000
--- a/apex/com.android.vndk.v30.pk8
+++ /dev/null
diff --git a/apex/com.android.vndk.v30.pubkey b/apex/com.android.vndk.v30.pubkey
deleted file mode 100644
index f4e1d0f..0000000
--- a/apex/com.android.vndk.v30.pubkey
+++ /dev/null
diff --git a/apex/com.android.vndk.v30.x509.pem b/apex/com.android.vndk.v30.x509.pem
deleted file mode 100644
index b085a1f..0000000
--- a/apex/com.android.vndk.v30.x509.pem
+++ /dev/null
@@ -1,32 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFbTCCA1WgAwIBAgIUXOSIxWWptk3TrXtTBeHf1PvZQX8wDQYJKoZIhvcNAQEL
-BQAwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoM
-GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDAgFw0xOTA5MjMxMDAyNDRaGA80NzU3
-MDgxOTEwMDI0NFowRTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUx
-ITAfBgNVBAoMGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDCCAiIwDQYJKoZIhvcN
-AQEBBQADggIPADCCAgoCggIBAM2JTUZORnjZG4NtFyMJV/6XxtjVzTm/ppqLQ9Qf
-tPtWkzolXW7lzWvnmXpfQ1kOqn7/H/lz1CSm69sw0DBvXiIWXZR+8Px5wI10njJd
-Up3CoVLdT9f4w8cfYHq4IZx95O9eARZWDuq3XVgg6P6pNa7f1okJSDV/rH+J4MIV
-P42RI8QjQoGUgVFWs6qRcPKgVoqN2TLifpdCoZFeAbePcIIIJy7+NgeFvohByf3c
-udADr002rYcsTdsLU6LjgSkQo/p6csdnY2ZfmTV95Uj0crW+nlcauTCkMEGmgYEU
-IAAz9FOZQNHTYS92FKXdH3jh7pA6x4awrbjxjWXluAYEUe5qiuWHkDjfslpC2G4H
-CsCzytWz5IVM/lhzMblDtM/BAJ4kV+MmLExp5mGRC1ETH8gZvVx4PMmZXNHrpPZr
-OaW7UaXlS3tKWgnk+h+Sg8KfO7QL4n31a3vvg17U2d0TGvyap1sjhP34upyVX1rj
-ZsZKv+lC0aOQUYNP3d59tc4dDT2At60Zl64Ij5+qcJOoip/TlTa5+3t6RxDc4eQS
-IUij+fSRVJvbAtCUm9n3a0JuuvNPRKrASk9dEgZOe7IlkahH600OSpGpfBMMY70G
-1GgjFCdv/MaFhKO4BGG6P5HzAjE+6UOZ+kKB+GzgA8LKiK8zrdkfBomLg25HMs6i
-pUsbAgMBAAGjUzBRMB0GA1UdDgQWBBRey7EDasVwou6zHd3dSVe0V0015TAfBgNV
-HSMEGDAWgBRey7EDasVwou6zHd3dSVe0V0015TAPBgNVHRMBAf8EBTADAQH/MA0G
-CSqGSIb3DQEBCwUAA4ICAQAB/EdIYWlEbly+W8Q3JK5odYdaeo4Bf2s0Z3njmnux
-5MKzW9qSnW0cy3WBpOEkLmpNMK1ctdi/la4O9qUrW8uCX8d0IvWI7DO+BB2TXQ0N
-RiVs/T4h1djO99UzQYkc+YG9FjFTl/1L0817PIjbHBKEzgdIpMRiwMVb/VxY5/RH
-+WX0P1RYOsHwr6nCcsFqqi5QPjFvkS75RwErh1t5q2ynmUm7IRavfqW+l4GrJRwP
-bEbSNcUOIZRHniVKfqSuvpI9Bclqi3ajLrlx0spOsXUr+TN9oKKdmDAJwv25/vD3
-SKN4jVJHt7XxAOVfX1mvQZUVMFA0iHXTwzFbHW79JaaTy6NBXBprqyS1E2Gk6nIL
-ivJ3ZASiQKzqpmmUVtCLjHnjSiDUuLdBSpCpucHuMSmkhO9ly1Bw1/ep7ZMAsmT5
-/mEvdBmg/9ITGLNwNmM0zutwCd2h9okDf5FxTyq5wwvGcwCmfMzHgr5ANYZsr0sz
-1xn3kTTeg6u9tEUsXCWS7z6oIBUhGvR15fLwDwIcktQ6QSKV3HiUFWTkoPBIZBFl
-HIk9rlC5jIMgJ5IAjjrulztZwdUYosv0e87RI4MTlA62FqwvT0J7zSzp/DutufMJ
-HolIS1WCaGFNuBDqqET1yIgZszeYbEmLDukXGMgcatqRxw14MLdFaDGZoBZlMstT
-1w==
------END CERTIFICATE-----