StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "clean up CL for androidmk variables"

Browse Source
This commit is contained in:
Sam Delmerico
2023-02-02 14:11:12 +00:00
committed by Gerrit Code Review
parent 24bfad66be 5fb794ae37
commit 1978fdf9b2
8 changed files with 143 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
cc/cc.go
View File

@@ -28,6 +28,7 @@ import (
"github.com/google/blueprint/proptools"
"android/soong/android"
"android/soong/bazel/cquery"
"android/soong/cc/config"
"android/soong/fuzz"
"android/soong/genrule"
@@ -1891,14 +1892,6 @@ func (c *Module) ProcessBazelQueryResponse(ctx android.ModuleContext) {
bazelCtx := ctx.Config().BazelContext
if ccInfo, err := bazelCtx.GetCcInfo(bazelModuleLabel, android.GetConfigKey(ctx)); err == nil {
c.tidyFiles = android.PathsForBazelOut(ctx, ccInfo.TidyFiles)
c.Properties.AndroidMkSharedLibs = ccInfo.LocalSharedLibs
c.Properties.AndroidMkStaticLibs = ccInfo.LocalStaticLibs
c.Properties.AndroidMkWholeStaticLibs = ccInfo.LocalWholeStaticLibs
}
if unstrippedInfo, err := bazelCtx.GetCcUnstrippedInfo(bazelModuleLabel, android.GetConfigKey(ctx)); err == nil {
c.Properties.AndroidMkSharedLibs = unstrippedInfo.LocalSharedLibs
c.Properties.AndroidMkStaticLibs = unstrippedInfo.LocalStaticLibs
c.Properties.AndroidMkWholeStaticLibs = unstrippedInfo.LocalWholeStaticLibs
}
c.bazelHandler.ProcessBazelQueryResponse(ctx, bazelModuleLabel)
@@ -2096,6 +2089,12 @@ func (c *Module) maybeInstall(ctx ModuleContext, apexInfo android.ApexInfo) {
}
}
func (c *Module) setAndroidMkVariablesFromCquery(info cquery.CcAndroidMkInfo) {
c.Properties.AndroidMkSharedLibs = info.LocalSharedLibs
c.Properties.AndroidMkStaticLibs = info.LocalStaticLibs
c.Properties.AndroidMkWholeStaticLibs = info.LocalWholeStaticLibs
}
func (c *Module) toolchain(ctx android.BaseModuleContext) config.Toolchain {
if c.cachedToolchain == nil {
c.cachedToolchain = config.FindToolchainWithContext(ctx)