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

Merge "Update compdb to put full path to compiler" am: 4087dd660f

Browse Source 
am: 1a90a8a5c0

Change-Id: I3916221ca82ee1044cfd41b5d77406a7596775d4
This commit is contained in:
Alex Light
2019-01-29 13:03:56 -08:00
committed by android-build-merger
parent dcea2d5247 1a90a8a5c0
commit 6ac171c19c
1 changed files with 2 additions and 2 deletions
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 return
} }
pathToCC, err := ctx.Eval(pctx, "${config.ClangBin}/") rootDir := getCompdbAndroidSrcRootDirectory(ctx)
pathToCC, err := ctx.Eval(pctx, rootDir+"/${config.ClangBin}/")
ccPath := "/bin/false" ccPath := "/bin/false"
cxxPath := "/bin/false" cxxPath := "/bin/false"
if err == nil { if err == nil {
ccPath = pathToCC + "clang" ccPath = pathToCC + "clang"
cxxPath = pathToCC + "clang++" cxxPath = pathToCC + "clang++"
} }
rootDir := getCompdbAndroidSrcRootDirectory(ctx)
for _, src := range srcs { for _, src := range srcs {
if _, ok := builds[src.String()]; !ok { if _, ok := builds[src.String()]; !ok {
builds[src.String()] = compDbEntry{ builds[src.String()] = compDbEntry{