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

Merge changes Ifa4594ea,Ia756f309 am: d26943459d am: 9fe62908b3 am: 710f9ae1b6 am: 232c3fdbc9

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

Change-Id: I952a95ae591cf662a0df0efbffb23e7ff8699a79
This commit is contained in:
Colin Cross
2021-10-18 23:09:57 +00:00
committed by Automerger Merge Worker
parent c7f394afd9 232c3fdbc9
commit 0af4f628f5
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/multiproduct_kati/main.go
View File

@@ -301,7 +301,7 @@ func main() {
jobs = runtime.NumCPU() / 4 jobs = runtime.NumCPU() / 4
ramGb := int(detectTotalRAM() / (1024 * 1024 * 1024)) ramGb := int(detectTotalRAM() / (1024 * 1024 * 1024))
if ramJobs := ramGb / 25; ramGb > 0 && jobs > ramJobs { if ramJobs := ramGb / 30; ramGb > 0 && jobs > ramJobs {
jobs = ramJobs jobs = ramJobs
} }

2
java/proto.go
View File

@@ -24,7 +24,7 @@ import (
func genProto(ctx android.ModuleContext, protoFiles android.Paths, flags android.ProtoFlags) android.Paths { func genProto(ctx android.ModuleContext, protoFiles android.Paths, flags android.ProtoFlags) android.Paths {
// Shard proto files into groups of 100 to avoid having to recompile all of them if one changes and to avoid // Shard proto files into groups of 100 to avoid having to recompile all of them if one changes and to avoid
// hitting command line length limits. // hitting command line length limits.
shards := android.ShardPaths(protoFiles, 100) shards := android.ShardPaths(protoFiles, 50)
srcJarFiles := make(android.Paths, 0, len(shards)) srcJarFiles := make(android.Paths, 0, len(shards))