Merge "Remove special-casing of DCLA libraries" (557423d9) · Commits · e / os / android_build_soong

android/bazel_handler.go

+1 −15

Original line number	Diff line number	Diff line
		@@ -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" {

+0 −3

Original line number	Diff line number	Diff line
		@@ -1997,9 +1997,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(),