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

Merge changes I4d0b27ba,Ic48e9cf2 into main am: 4ade19fe94 am: e7601cc83d am: ace644b7ae

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

Change-Id: Icee80b522710d9d6a2568ba8592685dd4c945341
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Colin Cross
2023-11-09 20:56:34 +00:00
committed by Automerger Merge Worker
parent 8de1f48965 ace644b7ae
commit 12228f7581
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android/util_test.go
View File

@@ -811,7 +811,7 @@ func TestReverseSlice(t *testing.T) {
if !reflect.DeepEqual(slice, testCase.expected) { if !reflect.DeepEqual(slice, testCase.expected) {
t.Errorf("expected %#v, got %#v", testCase.expected, slice) t.Errorf("expected %#v, got %#v", testCase.expected, slice)
} }
if slice != nil && unsafe.SliceData(testCase.in) == unsafe.SliceData(slice) { if cap(slice) > 0 && unsafe.SliceData(testCase.in) == unsafe.SliceData(slice) {
t.Errorf("expected slices to have different backing arrays") t.Errorf("expected slices to have different backing arrays")
} }
}) })

8
cmd/soong_ui/main.go
View File

@@ -692,9 +692,11 @@ func setMaxFiles(ctx build.Context) {
} }
ctx.Verbosef("Current file limits: %d soft, %d hard", limits.Cur, limits.Max) ctx.Verbosef("Current file limits: %d soft, %d hard", limits.Cur, limits.Max)
if limits.Cur == limits.Max {
return // Go 1.21 modifies the file limit but restores the original when
} // execing subprocesses if it hasn't be overridden. Call Setrlimit
// here even if it doesn't appear to be necessary so that the
// syscall package considers it set.
limits.Cur = limits.Max limits.Cur = limits.Max
err = syscall.Setrlimit(syscall.RLIMIT_NOFILE, &limits) err = syscall.Setrlimit(syscall.RLIMIT_NOFILE, &limits)