Add header_libs to cc_object
Needed to allow removal of the include_dirs property from the asm_defines.s module. Also, adds ObjectLinkerProperties to cc_defaults so that default settings of header_libs are correctly prepended to the properties in cc_object. Bug: 35624006 Test: m cpp-define-generator-asm-support - compare output before and after change Change-Id: Ib95d79c5eba4a89b7ab04b6c62090b720ec7e9fe
This commit is contained in:
parent
38aaf75e44
commit
a37832a3c3
4
cc/cc.go
4
cc/cc.go
|
@ -179,6 +179,9 @@ type Flags struct {
|
|||
}
|
||||
|
||||
type ObjectLinkerProperties struct {
|
||||
// list of modules that should only provide headers for this module.
|
||||
Header_libs []string `android:"arch_variant,variant_prepend"`
|
||||
|
||||
// names of other cc_object modules to link into this module using partial linking
|
||||
Objs []string `android:"arch_variant"`
|
||||
|
||||
|
@ -2083,6 +2086,7 @@ func DefaultsFactory(props ...interface{}) android.Module {
|
|||
&VendorProperties{},
|
||||
&BaseCompilerProperties{},
|
||||
&BaseLinkerProperties{},
|
||||
&ObjectLinkerProperties{},
|
||||
&LibraryProperties{},
|
||||
&FlagExporterProperties{},
|
||||
&BinaryLinkerProperties{},
|
||||
|
|
|
@ -66,6 +66,7 @@ func (object *objectLinker) linkerDeps(ctx DepsContext, deps Deps) Deps {
|
|||
deps.LateSharedLibs = append(deps.LateSharedLibs, "libc")
|
||||
}
|
||||
|
||||
deps.HeaderLibs = append(deps.HeaderLibs, object.Properties.Header_libs...)
|
||||
deps.ObjFiles = append(deps.ObjFiles, object.Properties.Objs...)
|
||||
return deps
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue