clean up CL for androidmk variables
Change-Id: If14d1925bea78f467740f8395f1d529db00b618c
diff --git a/cc/cc.go b/cc/cc.go
index f6f2a48..a7f22ef 100644
--- a/cc/cc.go
+++ b/cc/cc.go
@@ -28,6 +28,7 @@
"github.com/google/blueprint/proptools"
"android/soong/android"
+ "android/soong/bazel/cquery"
"android/soong/cc/config"
"android/soong/fuzz"
"android/soong/genrule"
@@ -1889,14 +1890,6 @@
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)
@@ -2094,6 +2087,12 @@
}
}
+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)