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

Merge "Only write CMakeLists.txt for normal variants"

Browse Source
This commit is contained in:
Treehugger Robot
2018-06-12 01:36:13 +00:00
committed by Gerrit Code Review
parent 01c66c199e dfe4752181
commit d27a18ff2f
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
cc/cmakelists.go
View File

@@ -62,10 +62,14 @@ func (c *cmakelistsGeneratorSingleton) GenerateBuildActions(ctx android.Singleto
outputDebugInfo = (getEnvVariable(envVariableGenerateDebugInfo, ctx) == envVariableTrue) outputDebugInfo = (getEnvVariable(envVariableGenerateDebugInfo, ctx) == envVariableTrue)
// Track which projects have already had CMakeLists.txt generated to keep the first
// variant for each project.
seenProjects := map[string]bool{}
ctx.VisitAllModules(func(module android.Module) { ctx.VisitAllModules(func(module android.Module) {
if ccModule, ok := module.(*Module); ok { if ccModule, ok := module.(*Module); ok {
if compiledModule, ok := ccModule.compiler.(CompiledInterface); ok { if compiledModule, ok := ccModule.compiler.(CompiledInterface); ok {
generateCLionProject(compiledModule, ctx, ccModule) generateCLionProject(compiledModule, ctx, ccModule, seenProjects)
} }
} }
}) })
@@ -114,14 +118,22 @@ func linkAggregateCMakeListsFiles(path string, info os.FileInfo, err error) erro
return nil return nil
} }
func generateCLionProject(compiledModule CompiledInterface, ctx android.SingletonContext, ccModule *Module) { func generateCLionProject(compiledModule CompiledInterface, ctx android.SingletonContext, ccModule *Module,
seenProjects map[string]bool) {
srcs := compiledModule.Srcs() srcs := compiledModule.Srcs()
if len(srcs) == 0 { if len(srcs) == 0 {
return return
} }
// Ensure the directory hosting the cmakelists.txt exists // Only write CMakeLists.txt for the first variant of each architecture of each module
clionproject_location := getCMakeListsForModule(ccModule, ctx) clionproject_location := getCMakeListsForModule(ccModule, ctx)
if seenProjects[clionproject_location] {
return
}
seenProjects[clionproject_location] = true
// Ensure the directory hosting the cmakelists.txt exists
projectDir := path.Dir(clionproject_location) projectDir := path.Dir(clionproject_location)
os.MkdirAll(projectDir, os.ModePerm) os.MkdirAll(projectDir, os.ModePerm)