Merge changes from topic "header_libs_requirement"
* changes: Add libstagefright_mp3dec_headers to allowed apex deps Require libraries in header_libs to be cc_library_header
This commit is contained in:
9
cc/cc.go
9
cc/cc.go
@@ -2411,7 +2411,14 @@ func (c *Module) depsToPaths(ctx android.ModuleContext) PathDeps {
|
||||
|
||||
switch {
|
||||
case libDepTag.header():
|
||||
// nothing
|
||||
if !ctx.OtherModuleHasProvider(dep, HeaderLibraryInfoProvider) {
|
||||
if !ctx.Config().AllowMissingDependencies() {
|
||||
ctx.ModuleErrorf("module %q is not a header library", depName)
|
||||
} else {
|
||||
ctx.AddMissingDependencies([]string{depName})
|
||||
}
|
||||
return
|
||||
}
|
||||
case libDepTag.shared():
|
||||
if !ctx.OtherModuleHasProvider(dep, SharedLibraryInfoProvider) {
|
||||
if !ctx.Config().AllowMissingDependencies() {
|
||||
|
Reference in New Issue
Block a user