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

Merge "Allowlist prebuilt/r8 for bp2build." into main

Browse Source
This commit is contained in:
Romain Jobredeaux
2023-08-23 20:43:47 +00:00
committed by Gerrit Code Review
parent 6c50f3ef06 890d6ea885
commit 573eabaa62
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
android/allowlists/allowlists.go
View File

@@ -338,6 +338,7 @@ var (
"prebuilts/sdk/current/support": Bp2BuildDefaultTrue, "prebuilts/sdk/current/support": Bp2BuildDefaultTrue,
"prebuilts/tools": Bp2BuildDefaultTrue, "prebuilts/tools": Bp2BuildDefaultTrue,
"prebuilts/tools/common/m2": Bp2BuildDefaultTrue, "prebuilts/tools/common/m2": Bp2BuildDefaultTrue,
"prebuilts/r8": Bp2BuildDefaultTrueRecursively,
"sdk/dumpeventlog": Bp2BuildDefaultTrue, "sdk/dumpeventlog": Bp2BuildDefaultTrue,
"sdk/eventanalyzer": Bp2BuildDefaultTrue, "sdk/eventanalyzer": Bp2BuildDefaultTrue,
@@ -1568,6 +1569,11 @@ var (
// depends on unconverted module tradefed // depends on unconverted module tradefed
"HelloWorldPerformanceTest", "HelloWorldPerformanceTest",
// r8 is a java_binary, which creates an implicit "r8.jar" target, but the
// same package contains a "r8.jar" file which gets overshadowed by the implicit target.
// We don't need this target as we're not using the Soong wrapper for now
"r8",
} }
// Bazel prod-mode allowlist. Modules in this list are built by Bazel // Bazel prod-mode allowlist. Modules in this list are built by Bazel