diff options
| author | 2022-11-10 13:58:48 -0800 | |
|---|---|---|
| committer | 2022-11-10 16:35:12 -0800 | |
| commit | 6a288bc7998e62cd49efa32da065bbe4987c1eff (patch) | |
| tree | ccb5026cf2c7e5dfbddbc0cb726e9ce987a9a077 /bpf/bpf.go | |
| parent | 877336cc3a7b66f8a1cfa6bedc426c7429ea78c9 (diff) | |
bpf: use PwdPrefix() helper
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
Diffstat (limited to 'bpf/bpf.go')
| -rw-r--r-- | bpf/bpf.go | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/bpf/bpf.go b/bpf/bpf.go index 737675057..a840fa3df 100644 --- a/bpf/bpf.go +++ b/bpf/bpf.go @@ -24,6 +24,7 @@ import ( "android/soong/android" "android/soong/bazel" "android/soong/bazel/cquery" + "android/soong/cc" "github.com/google/blueprint" "github.com/google/blueprint/proptools" @@ -32,9 +33,7 @@ import ( func init() { registerBpfBuildComponents(android.InitRegistrationContext) pctx.Import("android/soong/cc/config") - if runtime.GOOS != "darwin" { - pctx.StaticVariable("relPwd", "PWD=/proc/self/cwd") - } + pctx.StaticVariable("relPwd", cc.PwdPrefix()) } var ( |