tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove special-casing of DCLA libraries

Browse source 
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
This commit is contained in:
Spandan Das 2023-06-26 22:39:19 +00:00
parent 40b79f8def
commit 95b24b1165
2 changed files with 1 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
android/bazel_handler.go
View file

@ -176,8 +176,6 @@ type BazelContext interface {
// (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 @@ func (m MockBazelContext) IsModuleNameAllowed(_ string, _ bool) bool {
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 @@ func (n noopBazelContext) IsModuleNameAllowed(_ string, _ bool) bool {
return false
}
func (n noopBazelContext) IsModuleDclaAllowed(_ string) bool {
return false
}
func (m noopBazelContext) BuildStatementsToRegister() []*bazel.BuildStatement {
return []*bazel.BuildStatement{}
}
@ -598,17 +588,13 @@ func (context *mixedBuildBazelContext) IsModuleNameAllowed(moduleName string, wi
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" {

3
cc/cc.go
View file

@ -1968,9 +1968,6 @@ func allEnabledSanitizersSupportedByBazel(ctx android.BaseModuleContext, c *Modu
func GetApexConfigKey(ctx android.BaseModuleContext) *android.ApexConfigKey {
apexInfo := ctx.Provider(android.ApexInfoProvider).(android.ApexInfo)
if !apexInfo.IsForPlatform() {
if !ctx.Config().BazelContext.IsModuleDclaAllowed(ctx.Module().Name()) {
return nil
}
apexKey := android.ApexConfigKey{
WithinApex: true,
ApexSdkVersion: findApexSdkVersion(ctx, apexInfo).String(),