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

Merge "Generate Compdb file in the output directory"

Browse Source
This commit is contained in:
Treehugger Robot
2019-12-20 04:01:00 +00:00
committed by Gerrit Code Review
parent 4565aba98c 96279252d7
commit 076651765a
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
cc/compdb.go
View File

@@ -27,7 +27,7 @@ import (
// This singleton generates a compile_commands.json file. It does so for each // This singleton generates a compile_commands.json file. It does so for each
// blueprint Android.bp resulting in a cc.Module when either make, mm, mma, mmm // blueprint Android.bp resulting in a cc.Module when either make, mm, mma, mmm
// or mmma is called. It will only create a single compile_commands.json file // or mmma is called. It will only create a single compile_commands.json file
// at out/development/ide/compdb/compile_commands.json. It will also symlink it // at ${OUT_DIR}/soong/development/ide/compdb/compile_commands.json. It will also symlink it
// to ${SOONG_LINK_COMPDB_TO} if set. In general this should be created by running // to ${SOONG_LINK_COMPDB_TO} if set. In general this should be created by running
// make SOONG_GEN_COMPDB=1 nothing to get all targets. // make SOONG_GEN_COMPDB=1 nothing to get all targets.
@@ -43,7 +43,7 @@ type compdbGeneratorSingleton struct{}
const ( const (
compdbFilename = "compile_commands.json" compdbFilename = "compile_commands.json"
compdbOutputProjectsDirectory = "out/development/ide/compdb" compdbOutputProjectsDirectory = "development/ide/compdb"
// Environment variables used to modify behavior of this singleton. // Environment variables used to modify behavior of this singleton.
envVariableGenerateCompdb = "SOONG_GEN_COMPDB" envVariableGenerateCompdb = "SOONG_GEN_COMPDB"
@@ -78,12 +78,12 @@ func (c *compdbGeneratorSingleton) GenerateBuildActions(ctx android.SingletonCon
}) })
// Create the output file. // Create the output file.
dir := filepath.Join(getCompdbAndroidSrcRootDirectory(ctx), compdbOutputProjectsDirectory) dir := android.PathForOutput(ctx, compdbOutputProjectsDirectory)
os.MkdirAll(dir, 0777) os.MkdirAll(dir.String(), 0777)
compDBFile := filepath.Join(dir, compdbFilename) compDBFile := dir.Join(ctx, compdbFilename)
f, err := os.Create(compdbFilename) f, err := os.Create(compDBFile.String())
if err != nil { if err != nil {
log.Fatalf("Could not create file %s: %s", filepath.Join(dir, compdbFilename), err) log.Fatalf("Could not create file %s: %s", compDBFile, err)
} }
defer f.Close() defer f.Close()
@@ -106,7 +106,7 @@ func (c *compdbGeneratorSingleton) GenerateBuildActions(ctx android.SingletonCon
finalLinkPath := filepath.Join(ctx.Config().Getenv(envVariableCompdbLink), compdbFilename) finalLinkPath := filepath.Join(ctx.Config().Getenv(envVariableCompdbLink), compdbFilename)
if finalLinkPath != "" { if finalLinkPath != "" {
os.Remove(finalLinkPath) os.Remove(finalLinkPath)
if err := os.Symlink(compDBFile, finalLinkPath); err != nil { if err := os.Symlink(compDBFile.String(), finalLinkPath); err != nil {
log.Fatalf("Unable to symlink %s to %s: %s", compDBFile, finalLinkPath, err) log.Fatalf("Unable to symlink %s to %s: %s", compDBFile, finalLinkPath, err)
} }
} }