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

Merge "cc: Make generated_headers configurable" into main

Browse Source
This commit is contained in:
Aleks Todorov
2024-06-14 17:25:07 +00:00
committed by Gerrit Code Review
parent 36187c371e 93b6dd0036
commit 274b3c9521
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cc/compiler.go
View File

@@ -98,7 +98,7 @@ type BaseCompilerProperties struct {
// list of generated headers to add to the include path. These are the names // list of generated headers to add to the include path. These are the names
// of genrule modules. // of genrule modules.
Generated_headers []string `android:"arch_variant,variant_prepend"` Generated_headers proptools.Configurable[[]string] `android:"arch_variant,variant_prepend"`
// pass -frtti instead of -fno-rtti // pass -frtti instead of -fno-rtti
Rtti *bool `android:"arch_variant"` Rtti *bool `android:"arch_variant"`
@@ -302,7 +302,7 @@ func (compiler *baseCompiler) compilerInit(ctx BaseModuleContext) {}
func (compiler *baseCompiler) compilerDeps(ctx DepsContext, deps Deps) Deps { func (compiler *baseCompiler) compilerDeps(ctx DepsContext, deps Deps) Deps {
deps.GeneratedSources = append(deps.GeneratedSources, compiler.Properties.Generated_sources...) deps.GeneratedSources = append(deps.GeneratedSources, compiler.Properties.Generated_sources...)
deps.GeneratedSources = removeListFromList(deps.GeneratedSources, compiler.Properties.Exclude_generated_sources) deps.GeneratedSources = removeListFromList(deps.GeneratedSources, compiler.Properties.Exclude_generated_sources)
deps.GeneratedHeaders = append(deps.GeneratedHeaders, compiler.Properties.Generated_headers...) deps.GeneratedHeaders = append(deps.GeneratedHeaders, compiler.Properties.Generated_headers.GetOrDefault(ctx, nil)...)
deps.AidlLibs = append(deps.AidlLibs, compiler.Properties.Aidl.Libs...) deps.AidlLibs = append(deps.AidlLibs, compiler.Properties.Aidl.Libs...)
android.ProtoDeps(ctx, &compiler.Proto) android.ProtoDeps(ctx, &compiler.Proto)