openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Update compdb to put full path to compiler" 

am: 4087dd660f

Change-Id: I9bc32323ed59d55922a8555556f1f9c2807b48de
This commit is contained in:
Alex Light 2019-01-29 12:57:53 -08:00 committed by android-build-merger
parent 74916871db 4087dd660f
commit 1a90a8a5c0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cc/compdb.go
View File

@ -170,14 +170,14 @@ func generateCompdbProject(compiledModule CompiledInterface, ctx android.Singlet
return
}
pathToCC, err := ctx.Eval(pctx, "${config.ClangBin}/")
rootDir := getCompdbAndroidSrcRootDirectory(ctx)
pathToCC, err := ctx.Eval(pctx, rootDir+"/${config.ClangBin}/")
ccPath := "/bin/false"
cxxPath := "/bin/false"
if err == nil {
ccPath = pathToCC + "clang"
cxxPath = pathToCC + "clang++"
}
rootDir := getCompdbAndroidSrcRootDirectory(ctx)
for _, src := range srcs {
if _, ok := builds[src.String()]; !ok {
builds[src.String()] = compDbEntry{