diff --git a/android/allowlists/allowlists.go b/android/allowlists/allowlists.go index ad7232352..d320599e1 100644 --- a/android/allowlists/allowlists.go +++ b/android/allowlists/allowlists.go @@ -1598,11 +1598,6 @@ var ( "test_com.android.neuralnetworks", "libneuralnetworks", "libneuralnetworks_static", - // M13: media.swcodec launch - "com.android.media.swcodec", - "test_com.android.media.swcodec", - "libstagefright_foundation", - "libcodec2_hidl@1.0", } // Staging-mode allowlist. Modules in this list are only built @@ -1610,7 +1605,13 @@ 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{} + StagingMixedBuildsEnabledList = []string{ + // M13: media.swcodec launch + "com.android.media.swcodec", + "test_com.android.media.swcodec", + "libstagefright_foundation", + "libcodec2_hidl@1.0", + } // These should be the libs that are included by the apexes in the ProdMixedBuildsEnabledList ProdDclaMixedBuildsEnabledList = []string{ @@ -1618,12 +1619,13 @@ var ( "libc++", "libcrypto", "libcutils", - "libstagefright_flacdec", - "libutils", } // These should be the libs that are included by the apexes in the StagingMixedBuildsEnabledList - StagingDclaMixedBuildsEnabledList = []string{} + StagingDclaMixedBuildsEnabledList = []string{ + "libstagefright_flacdec", + "libutils", + } // TODO(b/269342245): Enable the rest of the DCLA libs // "libssl",