openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Temporarily disable cc_objects in mixed builds" am: 39d3830205 am: f84f690929 

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

Change-Id: I81922d74dedadca33819c479f2715b5a98cfd60f
This commit is contained in:
Liz Kammer 2021-03-16 22:35:11 +00:00 committed by Automerger Merge Worker
parent dd93334831 f84f690929
commit f0946b0715
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cc/object.go
View File

@ -53,19 +53,10 @@ type objectBazelHandler struct {
}
func (handler *objectBazelHandler) generateBazelBuildActions(ctx android.ModuleContext, label string) bool {
bazelCtx := ctx.Config().BazelContext
objPaths, ok := bazelCtx.GetCcObjectFiles(label, ctx.Arch().ArchType)
if ok {
if len(objPaths) != 1 {
ctx.ModuleErrorf("expected exactly one object file for '%s', but got %s", label, objPaths)
// TODO(b/181794963): restore mixed builds once cc_object incompatibility resolved
return false
}
handler.module.outputFile = android.OptionalPathForPath(android.PathForBazelOut(ctx, objPaths[0]))
}
return ok
}
type ObjectLinkerProperties struct {
// list of modules that should only provide headers for this module.
Header_libs []string `android:"arch_variant,variant_prepend"`