StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix sysprop_library build err when using filegroup"

Browse Source
This commit is contained in:
Treehugger Robot
2019-06-11 01:21:44 +00:00
committed by Gerrit Code Review
parent b6fd6f75f2 da63a49338
commit 4b0cc8c3c5
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cc/compiler.go
View File

@@ -225,11 +225,6 @@ func (compiler *baseCompiler) compilerDeps(ctx DepsContext, deps Deps) Deps {
deps = protoDeps(ctx, deps, &compiler.Proto, Bool(compiler.Properties.Proto.Static)) 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) { if Bool(compiler.Properties.Openmp) {
deps.StaticLibs = append(deps.StaticLibs, "libomp") deps.StaticLibs = append(deps.StaticLibs, "libomp")
} }

4
sysprop/sysprop_library.go
View File

@@ -123,6 +123,8 @@ func syspropLibraryHook(ctx android.LoadHookContext, m *syspropLibrary) {
Sysprop struct { Sysprop struct {
Platform *bool Platform *bool
} }
Header_libs []string
Shared_libs []string
}{} }{}
ccProps.Name = proptools.StringPtr(m.CcModuleName()) ccProps.Name = proptools.StringPtr(m.CcModuleName())
@@ -130,6 +132,8 @@ func syspropLibraryHook(ctx android.LoadHookContext, m *syspropLibrary) {
ccProps.Device_specific = proptools.BoolPtr(deviceSpecific) ccProps.Device_specific = proptools.BoolPtr(deviceSpecific)
ccProps.Product_specific = proptools.BoolPtr(productSpecific) ccProps.Product_specific = proptools.BoolPtr(productSpecific)
ccProps.Sysprop.Platform = proptools.BoolPtr(owner == "Platform") 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) ctx.CreateModule(android.ModuleFactoryAdaptor(cc.LibraryFactory), &m.commonProperties, &ccProps)
} }