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

This commit is contained in:
Trevor Radcliffe
2023-07-26 14:55:14 +00:00
committed by Gerrit Code Review

View File

@@ -1602,14 +1602,6 @@ var (
"test_com.android.neuralnetworks",
"libneuralnetworks",
"libneuralnetworks_static",
}
// Staging-mode allowlist. Modules in this list are only built
// by Bazel with --bazel-mode-staging. This list should contain modules
// 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{
// M13: media.swcodec launch
"com.android.media.swcodec",
"test_com.android.media.swcodec",
@@ -1617,20 +1609,26 @@ var (
"libcodec2_hidl@1.0",
}
// Staging-mode allowlist. Modules in this list are only built
// by Bazel with --bazel-mode-staging. This list should contain modules
// 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{}
// These should be the libs that are included by the apexes in the ProdMixedBuildsEnabledList
ProdDclaMixedBuildsEnabledList = []string{
"libbase",
"libc++",
"libcrypto",
"libcutils",
}
// These should be the libs that are included by the apexes in the StagingMixedBuildsEnabledList
StagingDclaMixedBuildsEnabledList = []string{
"libstagefright_flacdec",
"libutils",
}
// 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",