Revert "bp2build: build //system/core/libprocessgroup:libprocess..."
Revert submission 1814446
Reason for revert: causes failure of mixed_droid
Reverted Changes:
If5285f161:bp2build allowlist //external/libcxx/...
I4e7787374:bp2build: build //system/core/libprocessgroup:libp...
Ibec6d5fbe:bp2build: allowlist //external/brotli/... and buil...
Change-Id: Idcacf7b8e48e1cd156717d6b7a6d1f9534207d49
diff --git a/android/bazel.go b/android/bazel.go
index 1cafc3e..e392aa5 100644
--- a/android/bazel.go
+++ b/android/bazel.go
@@ -120,10 +120,6 @@
// 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
@@ -170,7 +166,6 @@
"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,
@@ -224,8 +219,6 @@
"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",
@@ -350,10 +343,11 @@
func bp2buildDefaultTrueRecursively(packagePath string, config Bp2BuildConfig) bool {
ret := false
- // Check if the package path has an exact match in the config.
- if config[packagePath] == Bp2BuildDefaultTrue || config[packagePath] == Bp2BuildDefaultTrueRecursively {
+ // Return exact matches in the config.
+ if config[packagePath] == Bp2BuildDefaultTrueRecursively {
return true
- } else if config[packagePath] == Bp2BuildDefaultFalse {
+ }
+ if config[packagePath] == Bp2BuildDefaultFalse {
return false
}