Support shared_libs, static_libs and default_shared_libs in cc_object
cc_object files don't link against static or shared libraries, but they
can use headers from them. Make cc_object use the default_shared_libs
headers, and add support for explicit static and shared library
dependencies.
Bug: 153662223
Test: go test ./cc/...
Change-Id: I9ab160ede06db1b135d217d72770c22f500cfe1b
diff --git a/cc/object.go b/cc/object.go
index 39fc43d..c0e0a9b 100644
--- a/cc/object.go
+++ b/cc/object.go
@@ -67,9 +67,19 @@
}
type ObjectLinkerProperties struct {
+ // list of static library modules that should only provide headers for this module.
+ Static_libs []string `android:"arch_variant,variant_prepend"`
+
+ // list of shared library modules should only provide headers for this module.
+ Shared_libs []string `android:"arch_variant"`
+
// list of modules that should only provide headers for this module.
Header_libs []string `android:"arch_variant,variant_prepend"`
+ // list of default libraries that will provide headers for this module. If unset, generally
+ // defaults to libc, libm, and libdl. Set to [] to prevent using headers from the defaults.
+ Default_shared_libs []string `android:"arch_variant"`
+
// names of other cc_object modules to link into this module using partial linking
Objs []string `android:"arch_variant"`
@@ -198,7 +208,18 @@
func (object *objectLinker) linkerDeps(ctx DepsContext, deps Deps) Deps {
deps.HeaderLibs = append(deps.HeaderLibs, object.Properties.Header_libs...)
+ deps.SharedLibs = append(deps.SharedLibs, object.Properties.Shared_libs...)
+ deps.StaticLibs = append(deps.StaticLibs, object.Properties.Static_libs...)
deps.ObjFiles = append(deps.ObjFiles, object.Properties.Objs...)
+
+ deps.SystemSharedLibs = object.Properties.Default_shared_libs
+ if deps.SystemSharedLibs == nil {
+ // Provide a default set of shared libraries if default_shared_libs is unspecified.
+ // Note: If an empty list [] is specified, it implies that the module declines the
+ // default shared libraries.
+ deps.SystemSharedLibs = append(deps.SystemSharedLibs, ctx.toolchain().DefaultSharedLibraries()...)
+ }
+ deps.LateSharedLibs = append(deps.LateSharedLibs, deps.SystemSharedLibs...)
return deps
}
@@ -247,6 +268,20 @@
return outputFile
}
+func (object *objectLinker) linkerSpecifiedDeps(specifiedDeps specifiedDeps) specifiedDeps {
+ specifiedDeps.sharedLibs = append(specifiedDeps.sharedLibs, object.Properties.Shared_libs...)
+
+ // Must distinguish nil and [] in default_shared_libs - ensure that [] in
+ // either input list doesn't come out as nil.
+ if specifiedDeps.defaultSharedLibs == nil {
+ specifiedDeps.defaultSharedLibs = object.Properties.Default_shared_libs
+ } else {
+ specifiedDeps.defaultSharedLibs = append(specifiedDeps.defaultSharedLibs, object.Properties.Default_shared_libs...)
+ }
+
+ return specifiedDeps
+}
+
func (object *objectLinker) unstrippedOutputFilePath() android.Path {
return nil
}