From 60eaabbe756d5f591d2df5f517941be32314bccd Mon Sep 17 00:00:00 2001 From: Jingwen Chen Date: Tue, 31 Aug 2021 05:58:01 +0000 Subject: [PATCH] bp2build: build //system/core/libprocessgroup:libprocessgroup_headers This adds //system/core/libprocessgroup to the denylist, but non-recursively, because there are other modules in its subpackages that don't build yet, so CI's bp2build-incremental's `//system/...` build can keep working. Fixes: 186826841 Test: bp2build-incremental //system/... Change-Id: I4e778737414364964de6328d7420512da224809c --- android/bazel.go | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/android/bazel.go b/android/bazel.go index e392aa5c3..1cafc3ecd 100644 --- a/android/bazel.go +++ b/android/bazel.go @@ -120,6 +120,10 @@ const ( // allows modules to opt-out. Bp2BuildDefaultTrueRecursively BazelConversionConfigEntry = iota + 1 + // all modules in this package (not recursively) default to bp2build_available: true. + // allows modules to opt-out. + Bp2BuildDefaultTrue + // all modules in this package (not recursively) default to bp2build_available: false. // allows modules to opt-in. Bp2BuildDefaultFalse @@ -166,6 +170,7 @@ var ( "development/sdk": Bp2BuildDefaultTrueRecursively, "external/gwp_asan": Bp2BuildDefaultTrueRecursively, "system/core/libcutils": Bp2BuildDefaultTrueRecursively, + "system/core/libprocessgroup": Bp2BuildDefaultTrue, "system/core/property_service/libpropertyinfoparser": Bp2BuildDefaultTrueRecursively, "system/libbase": Bp2BuildDefaultTrueRecursively, "system/logging/liblog": Bp2BuildDefaultTrueRecursively, @@ -219,6 +224,8 @@ var ( "gwp_asan_crash_handler", // cc_library, ld.lld: error: undefined symbol: memset + "libprocessgroup", // depends on //system/core/libprocessgroup/cgrouprc:libcgrouprc + // Tests. Handle later. "libbionic_tests_headers_posix", // http://b/186024507, cc_library_static, sched.h, time.h not found "libjemalloc5_integrationtest", @@ -343,11 +350,10 @@ func (b *BazelModuleBase) ConvertWithBp2build(ctx BazelConversionPathContext) bo func bp2buildDefaultTrueRecursively(packagePath string, config Bp2BuildConfig) bool { ret := false - // Return exact matches in the config. - if config[packagePath] == Bp2BuildDefaultTrueRecursively { + // Check if the package path has an exact match in the config. + if config[packagePath] == Bp2BuildDefaultTrue || config[packagePath] == Bp2BuildDefaultTrueRecursively { return true - } - if config[packagePath] == Bp2BuildDefaultFalse { + } else if config[packagePath] == Bp2BuildDefaultFalse { return false }