From f2e3c111ec3fdcdc8c4e0082b422abf97a69c964 Mon Sep 17 00:00:00 2001 From: Romain Jobredeaux Date: Fri, 6 Oct 2023 13:46:15 -0400 Subject: [PATCH 1/2] Allowlist kotlinx_coroutines_android Change-Id: Ib097d43e0abb6a94cdb4e0ff13d6ac3e0c13da9f --- android/allowlists/allowlists.go | 1 + 1 file changed, 1 insertion(+) diff --git a/android/allowlists/allowlists.go b/android/allowlists/allowlists.go index 7077f5601..40bbf4d60 100644 --- a/android/allowlists/allowlists.go +++ b/android/allowlists/allowlists.go @@ -853,6 +853,7 @@ var ( "kotlinx_coroutines", "kotlinx_coroutines-device", "kotlinx_coroutines-host", + "kotlinx_coroutines_android", // for building com.android.neuralnetworks "libimapper_stablec", From 69e2d83e8d6029366acf69a17a2c90e043c82ce6 Mon Sep 17 00:00:00 2001 From: Romain Jobredeaux Date: Fri, 6 Oct 2023 11:49:20 -0400 Subject: [PATCH 2/2] Allowlist prebuilt version aapt2 Bug: 303786272 Test: CI + Manual build Change-Id: I0a748430e4f2c4d77c6564562c3a85b0dc4368e4 --- android/allowlists/allowlists.go | 1 + 1 file changed, 1 insertion(+) diff --git a/android/allowlists/allowlists.go b/android/allowlists/allowlists.go index 40bbf4d60..46f9e8ff3 100644 --- a/android/allowlists/allowlists.go +++ b/android/allowlists/allowlists.go @@ -672,6 +672,7 @@ var ( // prebuilts "prebuilt_stats-log-api-gen", + "prebuilt_aapt2", // fastboot "fastboot",