tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "cc: add exclude_generated_sources property" am: 5aa31347bc am: d7f8cd0baf

Browse source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1354450

Change-Id: I5213f0c050fb6daf552d6adb376d3fa3a6bc59b3
This commit is contained in:
Jooyung Han 2020-07-06 21:59:05 +00:00 committed by Automerger Merge Worker
commit efa4ecd851
2 changed files with 19 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cc/cc.go
View file

@ -3004,6 +3004,9 @@ func squashVendorSrcs(m *Module) {
lib.baseCompiler.Properties.Exclude_srcs = append(lib.baseCompiler.Properties.Exclude_srcs,
lib.baseCompiler.Properties.Target.Vendor.Exclude_srcs...)
lib.baseCompiler.Properties.Exclude_generated_sources = append(lib.baseCompiler.Properties.Exclude_generated_sources,
lib.baseCompiler.Properties.Target.Vendor.Exclude_generated_sources...)
}
}
@ -3014,6 +3017,9 @@ func squashRecoverySrcs(m *Module) {
lib.baseCompiler.Properties.Exclude_srcs = append(lib.baseCompiler.Properties.Exclude_srcs,
lib.baseCompiler.Properties.Target.Recovery.Exclude_srcs...)
lib.baseCompiler.Properties.Exclude_generated_sources = append(lib.baseCompiler.Properties.Exclude_generated_sources,
lib.baseCompiler.Properties.Target.Recovery.Exclude_generated_sources...)
}
}

13
cc/compiler.go
View file

@ -86,6 +86,10 @@ type BaseCompilerProperties struct {
// genrule modules.
Generated_sources []string `android:"arch_variant"`
// list of generated sources that should not be used to build the C/C++ module.
// This is most useful in the arch/multilib variants to remove non-common files
Exclude_generated_sources []string `android:"arch_variant"`
// list of generated headers to add to the include path. These are the names
// of genrule modules.
Generated_headers []string `android:"arch_variant"`
@ -150,6 +154,10 @@ type BaseCompilerProperties struct {
// List of additional cflags that should be used to build the vendor
// variant of the C/C++ module.
Cflags []string
// list of generated sources that should not be used to
// build the vendor variant of the C/C++ module.
Exclude_generated_sources []string
}
Recovery struct {
// list of source files that should only be used in the
@ -163,6 +171,10 @@ type BaseCompilerProperties struct {
// List of additional cflags that should be used to build the recovery
// variant of the C/C++ module.
Cflags []string
// list of generated sources that should not be used to
// build the recovery variant of the C/C++ module.
Exclude_generated_sources []string
}
}
@ -227,6 +239,7 @@ func (compiler *baseCompiler) compilerInit(ctx BaseModuleContext) {}
func (compiler *baseCompiler) compilerDeps(ctx DepsContext, deps Deps) Deps {
deps.GeneratedSources = append(deps.GeneratedSources, compiler.Properties.Generated_sources...)
deps.GeneratedSources = removeListFromList(deps.GeneratedSources, compiler.Properties.Exclude_generated_sources)
deps.GeneratedHeaders = append(deps.GeneratedHeaders, compiler.Properties.Generated_headers...)
android.ProtoDeps(ctx, &compiler.Proto)