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

Merge "cc bazel handlers: use better interface checking" am: b002f87d2e

Browse source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2098663

Change-Id: I4b76d5925f96c0b2d17b1d19e51f77c90266bffc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Christopher Parsons 2022-05-23 19:30:01 +00:00 committed by Automerger Merge Worker
commit 6be00cbfac
5 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cc/binary.go
View file

@ -563,11 +563,11 @@ func (binary *binaryDecorator) verifyHostBionicLinker(ctx ModuleContext, in, lin
}
type ccBinaryBazelHandler struct {
BazelHandler
module *Module
}
var _ BazelHandler = (*ccBinaryBazelHandler)(nil)
func (handler *ccBinaryBazelHandler) QueueBazelCall(ctx android.BaseModuleContext, label string) {
bazelCtx := ctx.Config().BazelContext
bazelCtx.QueueBazelRequest(label, cquery.GetOutputFiles, android.GetConfigKey(ctx))

4
cc/library.go
View file

@ -642,11 +642,11 @@ type libraryDecorator struct {
}
type ccLibraryBazelHandler struct {
BazelHandler
module *Module
}
var _ BazelHandler = (*ccLibraryBazelHandler)(nil)
// generateStaticBazelBuildActions constructs the StaticLibraryInfo Soong
// provider from a Bazel shared library's CcInfo provider.
func (handler *ccLibraryBazelHandler) generateStaticBazelBuildActions(ctx android.ModuleContext, label string, ccInfo cquery.CcInfo) {

4
cc/library_headers.go
View file

@ -49,12 +49,12 @@ func RegisterLibraryHeadersBuildComponents(ctx android.RegistrationContext) {
}
type libraryHeaderBazelHandler struct {
BazelHandler
module *Module
library *libraryDecorator
}
var _ BazelHandler = (*libraryHeaderBazelHandler)(nil)
func (handler *libraryHeaderBazelHandler) QueueBazelCall(ctx android.BaseModuleContext, label string) {
bazelCtx := ctx.Config().BazelContext
bazelCtx.QueueBazelRequest(label, cquery.GetCcInfo, android.GetConfigKey(ctx))

4
cc/object.go
View file

@ -47,11 +47,11 @@ type objectLinker struct {
}
type objectBazelHandler struct {
BazelHandler
module *Module
}
var _ BazelHandler = (*objectBazelHandler)(nil)
func (handler *objectBazelHandler) QueueBazelCall(ctx android.BaseModuleContext, label string) {
bazelCtx := ctx.Config().BazelContext
bazelCtx.QueueBazelRequest(label, cquery.GetOutputFiles, android.GetConfigKey(ctx))

8
cc/prebuilt.go
View file

@ -407,12 +407,12 @@ type prebuiltObjectLinker struct {
}
type prebuiltStaticLibraryBazelHandler struct {
BazelHandler
module *Module
library *libraryDecorator
}
var _ BazelHandler = (*prebuiltStaticLibraryBazelHandler)(nil)
func (h *prebuiltStaticLibraryBazelHandler) QueueBazelCall(ctx android.BaseModuleContext, label string) {
bazelCtx := ctx.Config().BazelContext
bazelCtx.QueueBazelRequest(label, cquery.GetCcInfo, android.GetConfigKey(ctx))
@ -458,12 +458,12 @@ func (h *prebuiltStaticLibraryBazelHandler) ProcessBazelQueryResponse(ctx androi
}
type prebuiltSharedLibraryBazelHandler struct {
BazelHandler
module *Module
library *libraryDecorator
}
var _ BazelHandler = (*prebuiltSharedLibraryBazelHandler)(nil)
func (h *prebuiltSharedLibraryBazelHandler) QueueBazelCall(ctx android.BaseModuleContext, label string) {
bazelCtx := ctx.Config().BazelContext
bazelCtx.QueueBazelRequest(label, cquery.GetCcInfo, android.GetConfigKey(ctx))