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

Merge "Make the WholeStatic/Static/Shared libs properties configurable" into main

Browse Source
This commit is contained in:
Cole Faust
2024-08-19 22:48:16 +00:00
committed by Gerrit Code Review
parent ea66cdd278 f0006e7137
commit 5b1a39a92a
12 changed files with 83 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
cc/cmake_snapshot.go
View File

@@ -204,12 +204,28 @@ func parseTemplate(templateContents string) *template.Template {
return m.compiler.baseCompilerProps()
},
"getCflagsProperty": func(ctx android.ModuleContext, m *Module) []string {
cflags := m.compiler.baseCompilerProps().Cflags
return cflags.GetOrDefault(ctx, nil)
prop := m.compiler.baseCompilerProps().Cflags
return prop.GetOrDefault(ctx, nil)
},
"getLinkerProperties": func(m *Module) BaseLinkerProperties {
return m.linker.baseLinkerProps()
},
"getWholeStaticLibsProperty": func(ctx android.ModuleContext, m *Module) []string {
prop := m.linker.baseLinkerProps().Whole_static_libs
return prop.GetOrDefault(ctx, nil)
},
"getStaticLibsProperty": func(ctx android.ModuleContext, m *Module) []string {
prop := m.linker.baseLinkerProps().Static_libs
return prop.GetOrDefault(ctx, nil)
},
"getSharedLibsProperty": func(ctx android.ModuleContext, m *Module) []string {
prop := m.linker.baseLinkerProps().Shared_libs
return prop.GetOrDefault(ctx, nil)
},
"getHeaderLibsProperty": func(ctx android.ModuleContext, m *Module) []string {
prop := m.linker.baseLinkerProps().Header_libs
return prop.GetOrDefault(ctx, nil)
},
"getExtraLibs": getExtraLibs,
"getIncludeDirs": getIncludeDirs,
"mapLibraries": func(ctx android.ModuleContext, m *Module, libs []string, mapping map[string]LibraryMappingProperty) []string {