diff options
Diffstat (limited to 'android/bazel.go')
| -rw-r--r-- | android/bazel.go | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/android/bazel.go b/android/bazel.go index 8341e5725..bfd0f909a 100644 --- a/android/bazel.go +++ b/android/bazel.go @@ -150,17 +150,23 @@ var ( "build/bazel/platforms":/* recursive = */ true, "build/bazel/product_variables":/* recursive = */ true, "build/bazel_common_rules":/* recursive = */ true, + "build/make/tools":/* recursive = */ true, "build/pesto":/* recursive = */ true, // external/bazelbuild-rules_android/... is needed by mixed builds, otherwise mixed builds analysis fails // e.g. ERROR: Analysis of target '@soong_injection//mixed_builds:buildroot' failed "external/bazelbuild-rules_android":/* recursive = */ true, "external/bazel-skylib":/* recursive = */ true, + "external/guava":/* recursive = */ true, + "external/error_prone":/* recursive = */ true, + "external/jsr305":/* recursive = */ true, + "frameworks/ex/common":/* recursive = */ true, "prebuilts/sdk":/* recursive = */ false, "prebuilts/sdk/tools":/* recursive = */ false, "prebuilts/r8":/* recursive = */ false, "packages/apps/Music":/* recursive = */ true, + "packages/apps/QuickSearchBox":/* recursive = */ true, } // Configure modules in these directories to enable bp2build_available: true or false by default. @@ -259,7 +265,6 @@ var ( // Per-module denylist of cc_library modules to only generate the static // variant if their shared variant isn't ready or buildable by Bazel. bp2buildCcLibraryStaticOnlyList = []string{ - "libstdc++", // http://b/186822597, cc_library, ld.lld: error: undefined symbol: __errno "libjemalloc5", // http://b/188503688, cc_library, `target: { android: { enabled: false } }` for android targets. } @@ -294,8 +299,8 @@ func init() { } } -func GenerateCcLibraryStaticOnly(ctx BazelConversionPathContext) bool { - return bp2buildCcLibraryStaticOnly[ctx.Module().Name()] +func GenerateCcLibraryStaticOnly(moduleName string) bool { + return bp2buildCcLibraryStaticOnly[moduleName] } func ShouldKeepExistingBuildFileForDir(dir string) bool { @@ -325,7 +330,7 @@ func (b *BazelModuleBase) MixedBuildsEnabled(ctx BazelConversionPathContext) boo return false } - if GenerateCcLibraryStaticOnly(ctx) { + if GenerateCcLibraryStaticOnly(ctx.Module().Name()) { // Don't use partially-converted cc_library targets in mixed builds, // since mixed builds would generally rely on both static and shared // variants of a cc_library. |