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

Fix apex bp2build.

Browse Source 
apexBundle was missing InitBazelModule for it to have bazel_module properties.

Test: soong unit test
Fixes: 193866723
Change-Id: I5fb38c8b2e8edaecef44162491d399c0223d3fb1
This commit is contained in:
Jingwen Chen
2021-07-16 09:28:53 +00:00
parent 51736b82fc
commit f59a8e117e
3 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
android/bazel.go
View File

@@ -129,7 +129,7 @@ var (
// Keep any existing BUILD files (and do not generate new BUILD files) for these directories
bp2buildKeepExistingBuildFile = map[string]bool{
// This is actually build/bazel/build.BAZEL symlinked to ./BUILD
".":/*recrusive = */ false,
".":/*recursive = */ false,
"build/bazel":/* recursive = */ true,
"build/pesto":/* recursive = */ true,
@@ -144,9 +144,10 @@ var (
// Configure modules in these directories to enable bp2build_available: true or false by default.
bp2buildDefaultConfig = Bp2BuildConfig{
"bionic": Bp2BuildDefaultTrueRecursively,
"external/gwp_asan": Bp2BuildDefaultTrueRecursively,
"system/core/libcutils": Bp2BuildDefaultTrueRecursively,
"bionic": Bp2BuildDefaultTrueRecursively,
"build/bazel/examples/apex/minimal": Bp2BuildDefaultTrueRecursively,
"external/gwp_asan": Bp2BuildDefaultTrueRecursively,
"system/core/libcutils": Bp2BuildDefaultTrueRecursively,
"system/core/property_service/libpropertyinfoparser": Bp2BuildDefaultTrueRecursively,
"system/libbase": Bp2BuildDefaultTrueRecursively,
"system/logging/liblog": Bp2BuildDefaultTrueRecursively,