Merge "Revert "add media.swcodec to Bazel prod allowlist""

This commit is contained in:
Jingwen Chen 2023-06-30 04:23:40 +00:00 committed by Gerrit Code Review
commit 661b2ee719

View file

@ -1598,11 +1598,6 @@ var (
"test_com.android.neuralnetworks", "test_com.android.neuralnetworks",
"libneuralnetworks", "libneuralnetworks",
"libneuralnetworks_static", "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 // Staging-mode allowlist. Modules in this list are only built
@ -1610,7 +1605,13 @@ var (
// which will soon be added to the prod allowlist. // which will soon be added to the prod allowlist.
// It is implicit that all modules in ProdMixedBuildsEnabledList will // It is implicit that all modules in ProdMixedBuildsEnabledList will
// also be built - do not add them to this list. // 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 // These should be the libs that are included by the apexes in the ProdMixedBuildsEnabledList
ProdDclaMixedBuildsEnabledList = []string{ ProdDclaMixedBuildsEnabledList = []string{
@ -1618,12 +1619,13 @@ var (
"libc++", "libc++",
"libcrypto", "libcrypto",
"libcutils", "libcutils",
"libstagefright_flacdec",
"libutils",
} }
// These should be the libs that are included by the apexes in the StagingMixedBuildsEnabledList // 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 // TODO(b/269342245): Enable the rest of the DCLA libs
// "libssl", // "libssl",