Remove special-casing of DCLA libraries
This is a revert of aosp/2449906
mixed build currently supports platform and apex variants of allowlisted
cc libraries. However when building apex variants, we would pass an
apexKey only for allowlisted _dcla_ libraries. This meant that for libraries in
mixed build allowlist but not in dcla allowlist, Soong's apex variants
were being replaced with Bazel's platform variants.
Bug: 270339610
Bug: 288906815
Test: Added libnativeloader, libartpalette-system to prod mixed build
allowlist and `m`
Change-Id: I922fed898b3c3961466cd1165c371839a4192237
diff --git a/android/bazel_handler.go b/android/bazel_handler.go
index 4b1a8f4..d5ccfca 100644
--- a/android/bazel_handler.go
+++ b/android/bazel_handler.go
@@ -176,8 +176,6 @@
// (for example, that it is MixedBuildBuildable).
IsModuleNameAllowed(moduleName string, withinApex bool) bool
- IsModuleDclaAllowed(moduleName string) bool
-
// Returns the bazel output base (the root directory for all bazel intermediate outputs).
OutputBase() string
@@ -316,10 +314,6 @@
return true
}
-func (m MockBazelContext) IsModuleDclaAllowed(_ string) bool {
- return true
-}
-
func (m MockBazelContext) OutputBase() string { return m.OutputBaseDir }
func (m MockBazelContext) BuildStatementsToRegister() []*bazel.BuildStatement {
@@ -461,10 +455,6 @@
return false
}
-func (n noopBazelContext) IsModuleDclaAllowed(_ string) bool {
- return false
-}
-
func (m noopBazelContext) BuildStatementsToRegister() []*bazel.BuildStatement {
return []*bazel.BuildStatement{}
}
@@ -598,17 +588,13 @@
if context.bazelEnabledModules[moduleName] {
return true
}
- if withinApex && context.IsModuleDclaAllowed(moduleName) {
+ if withinApex && context.bazelDclaEnabledModules[moduleName] {
return true
}
return false
}
-func (context *mixedBuildBazelContext) IsModuleDclaAllowed(moduleName string) bool {
- return context.bazelDclaEnabledModules[moduleName]
-}
-
func pwdPrefix() string {
// Darwin doesn't have /proc
if runtime.GOOS != "darwin" {