Fix sysprop_library build err when using filegroup
.sysprop files are intended to be used only with sysprop_library, and we can prevent build error by specifying dependencies upon CreateModule. Bug: 131708148 Test: 1) try building sysprop_library module. Test: 2) see liblog is correctly linked. Change-Id: I702cedc255ee0b6a30c15e474dd6a88d9607b145
This commit is contained in:
@@ -225,11 +225,6 @@ func (compiler *baseCompiler) compilerDeps(ctx DepsContext, deps Deps) Deps {
|
||||
deps = protoDeps(ctx, deps, &compiler.Proto, Bool(compiler.Properties.Proto.Static))
|
||||
}
|
||||
|
||||
if compiler.hasSrcExt(".sysprop") {
|
||||
deps.HeaderLibs = append(deps.HeaderLibs, "libbase_headers")
|
||||
deps.SharedLibs = append(deps.SharedLibs, "liblog")
|
||||
}
|
||||
|
||||
if Bool(compiler.Properties.Openmp) {
|
||||
deps.StaticLibs = append(deps.StaticLibs, "libomp")
|
||||
}
|
||||
|
@@ -123,6 +123,8 @@ func syspropLibraryHook(ctx android.LoadHookContext, m *syspropLibrary) {
|
||||
Sysprop struct {
|
||||
Platform *bool
|
||||
}
|
||||
Header_libs []string
|
||||
Shared_libs []string
|
||||
}{}
|
||||
|
||||
ccProps.Name = proptools.StringPtr(m.CcModuleName())
|
||||
@@ -130,6 +132,8 @@ func syspropLibraryHook(ctx android.LoadHookContext, m *syspropLibrary) {
|
||||
ccProps.Device_specific = proptools.BoolPtr(deviceSpecific)
|
||||
ccProps.Product_specific = proptools.BoolPtr(productSpecific)
|
||||
ccProps.Sysprop.Platform = proptools.BoolPtr(owner == "Platform")
|
||||
ccProps.Header_libs = []string{"libbase_headers"}
|
||||
ccProps.Shared_libs = []string{"liblog"}
|
||||
|
||||
ctx.CreateModule(android.ModuleFactoryAdaptor(cc.LibraryFactory), &m.commonProperties, &ccProps)
|
||||
}
|
||||
|
Reference in New Issue
Block a user