StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "add media.swcodec to Bazel prod allowlist"" am: 661b2ee719 am: 2fcebc1959 am: f3a74c87c9

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2645429

Change-Id: I5cc2a0cd3b2beaed876c91b38245d60bf61f5d27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jingwen Chen
2023-06-30 06:27:16 +00:00
committed by Automerger Merge Worker
parent 3658def394 f3a74c87c9
commit ac2a58feaa
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
android/allowlists/allowlists.go
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",