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

Merge "Use manual BUILD files in jdk8 and allowlist apache-commons-compress" into main am: e2007bfd0e am: fc6a6fd081

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

Change-Id: Id85f25741908bc67982813fcd9f2bbc2bbebc626
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Romain Jobredeaux
2023-10-02 14:25:22 +00:00
committed by Automerger Merge Worker
parent c600c8b9f4 fc6a6fd081
commit 49b07dc069
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android/allowlists/allowlists.go
View File

@@ -503,6 +503,7 @@ var (
"prebuilts/clang-tools":/* recursive = */ true, "prebuilts/clang-tools":/* recursive = */ true,
"prebuilts/gcc":/* recursive = */ true, "prebuilts/gcc":/* recursive = */ true,
"prebuilts/build-tools":/* recursive = */ true, "prebuilts/build-tools":/* recursive = */ true,
"prebuilts/jdk/jdk8":/* recursive = */ true,
"prebuilts/jdk/jdk17":/* recursive = */ true, "prebuilts/jdk/jdk17":/* recursive = */ true,
"prebuilts/misc":/* recursive = */ false, // not recursive because we need bp2build converted build files in prebuilts/misc/common/asm "prebuilts/misc":/* recursive = */ false, // not recursive because we need bp2build converted build files in prebuilts/misc/common/asm
"prebuilts/sdk":/* recursive = */ false, "prebuilts/sdk":/* recursive = */ false,
@@ -938,6 +939,7 @@ var (
"libopenjdkjvmti_headers", "libopenjdkjvmti_headers",
// tradefed deps // tradefed deps
"apache-commons-compress",
"tradefed-protos", "tradefed-protos",
"grpc-java", "grpc-java",
"grpc-java-api", "grpc-java-api",