diff options
| -rw-r--r-- | android/allowlists/allowlists.go | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/android/allowlists/allowlists.go b/android/allowlists/allowlists.go index 938c41e9f..4d09a42a1 100644 --- a/android/allowlists/allowlists.go +++ b/android/allowlists/allowlists.go @@ -1435,8 +1435,10 @@ var ( // Bazel prod-mode allowlist. Modules in this list are built by Bazel // in either prod mode or staging mode. ProdMixedBuildsEnabledList = []string{ + // M5: tzdata launch "com.android.tzdata", "test1_com.android.tzdata", + // M7: adbd launch "com.android.adbd", "test_com.android.adbd", "adbd_test", @@ -1444,6 +1446,8 @@ var ( "adb_pairing_auth_test", "adb_pairing_connection_test", "adb_tls_connection_test", + // M9: mixed builds for mainline trains launch + "api_fingerprint", } // Staging-mode allowlist. Modules in this list are only built @@ -1451,21 +1455,19 @@ var ( // which will soon be added to the prod allowlist. // It is implicit that all modules in ProdMixedBuildsEnabledList will // also be built - do not add them to this list. - StagingMixedBuildsEnabledList = []string{ - "api_fingerprint", - } + StagingMixedBuildsEnabledList = []string{} // These should be the libs that are included by the apexes in the ProdMixedBuildsEnabledList - ProdDclaMixedBuildsEnabledList = []string{} - - // These should be the libs that are included by the apexes in the StagingMixedBuildsEnabledList - StagingDclaMixedBuildsEnabledList = []string{ + ProdDclaMixedBuildsEnabledList = []string{ "libbase", "libc++", "libcrypto", "libcutils", } + // These should be the libs that are included by the apexes in the StagingMixedBuildsEnabledList + StagingDclaMixedBuildsEnabledList = []string{} + // TODO(b/269342245): Enable the rest of the DCLA libs // "libssl", // "libstagefright_flacdec", |