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

Support a few more attrs in cc_aconfig_library.

Browse Source 
More might be added later when we have an allowlist.

Bug: 305998969
Test: b build with the change in ag/25094394
Change-Id: I92df843ac81f4e33ce7506db61c989a380015975
This commit is contained in:
Yu Liu
2023-10-20 19:15:51 +00:00
parent de88e35004
commit f11b7c3093
7 changed files with 28 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cc/bp2build.go
View File

@@ -85,7 +85,7 @@ type staticOrSharedAttributes struct {
Features bazel.StringListAttribute
sdkAttributes
SdkAttributes
tidyAttributes
}
@@ -1185,7 +1185,7 @@ func bp2buildCcAidlLibrary(
implementationDynamicDeps := linkerAttrs.dynamicDeps.Clone()
implementationDynamicDeps.Append(linkerAttrs.implementationDynamicDeps)
sdkAttrs := bp2BuildParseSdkAttributes(m)
sdkAttrs := Bp2BuildParseSdkAttributes(m)
exportedIncludes := bp2BuildParseExportedIncludes(ctx, m, &compilerAttrs.includes)
includeAttrs := includesAttributes{
@@ -1207,7 +1207,7 @@ func bp2buildCcAidlLibrary(
Implementation_deps: *implementationDeps,
Implementation_dynamic_deps: *implementationDynamicDeps,
Tags: apexAvailableTags,
sdkAttributes: sdkAttrs,
SdkAttributes: sdkAttrs,
includesAttributes: includeAttrs,
},
)
@@ -1222,14 +1222,14 @@ func bp2buildCcAidlLibrary(
return nil
}
func bp2BuildParseSdkAttributes(module *Module) sdkAttributes {
return sdkAttributes{
func Bp2BuildParseSdkAttributes(module *Module) SdkAttributes {
return SdkAttributes{
Sdk_version: module.Properties.Sdk_version,
Min_sdk_version: module.Properties.Min_sdk_version,
}
}
type sdkAttributes struct {
type SdkAttributes struct {
Sdk_version *string
Min_sdk_version *string
}