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

bpf: use PwdPrefix() helper

Browse Source 
relPwd is only set if runtime.GOOS != "darwin" but is used
unconditionally. Instead, unconditionally set relPwd using the
cc.PwdPrefix() helper.

Bug: 238165437
Test: m timeInState.o
Signed-off-by: Connor O'Brien <connoro@google.com>
Change-Id: I5294bb6ea95dad60fbf64e9d958e1f1b32a02a48
This commit is contained in:
Connor O'Brien
2022-11-10 13:58:48 -08:00
parent 877336cc3a
commit 6a288bc799
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
bpf/bpf.go
View File

@@ -24,6 +24,7 @@ import (
"android/soong/android" "android/soong/android"
"android/soong/bazel" "android/soong/bazel"
"android/soong/bazel/cquery" "android/soong/bazel/cquery"
"android/soong/cc"
"github.com/google/blueprint" "github.com/google/blueprint"
"github.com/google/blueprint/proptools" "github.com/google/blueprint/proptools"
@@ -32,9 +33,7 @@ import (
func init() { func init() {
registerBpfBuildComponents(android.InitRegistrationContext) registerBpfBuildComponents(android.InitRegistrationContext)
pctx.Import("android/soong/cc/config") pctx.Import("android/soong/cc/config")
if runtime.GOOS != "darwin" { pctx.StaticVariable("relPwd", cc.PwdPrefix())
pctx.StaticVariable("relPwd", "PWD=/proc/self/cwd")
}
} }
var ( var (