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

Merge "Set OUT_DIR=out with no src_deps." am: d61ea3580d

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2518975

Change-Id: Iec20dffdd5b00d2f6d1d2aebca78bce45601f495
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-04-03 21:03:23 +00:00
committed by Automerger Merge Worker
parent 17ea43ba7f d61ea3580d
commit 3295e672e2
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
rust/builder.go
View File

@@ -208,6 +208,9 @@ func rustEnvVars(ctx ModuleContext, deps PathDeps) []string {
outDirPrefix = ""
}
envVars = append(envVars, "OUT_DIR="+filepath.Join(outDirPrefix, moduleGenDir.String()))
} else {
// TODO(pcc): Change this to "OUT_DIR=" after fixing crates to not rely on this value.
envVars = append(envVars, "OUT_DIR=out")
}
return envVars