tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Allow specifying sub-dir in sbox output" into main am: b129b7cba2

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

Change-Id: Id9e9b8f7f9b78604dbe5233883c526c9c1589a79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Anas Sulaiman 2024-02-09 13:19:23 +00:00 committed by Automerger Merge Worker
commit 884252056c
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
android/rule_builder.go
View file

@ -1157,11 +1157,15 @@ func (c *RuleBuilderCommand) Outputs(paths WritablePaths) *RuleBuilderCommand {
// OutputDir adds the output directory to the command line. This is only available when used with RuleBuilder.Sbox,
// and will be the temporary output directory managed by sbox, not the final one.
func (c *RuleBuilderCommand) OutputDir() *RuleBuilderCommand {
func (c *RuleBuilderCommand) OutputDir(subPathComponents ...string) *RuleBuilderCommand {
if !c.rule.sbox {
panic("OutputDir only valid with Sbox")
}
return c.Text(sboxOutDir)
path := sboxOutDir
if len(subPathComponents) > 0 {
path = filepath.Join(append([]string{sboxOutDir}, subPathComponents...)...)
}
return c.Text(path)
}
// DepFile adds the specified depfile path to the paths returned by RuleBuilder.DepFiles and adds it to the command