Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 710f9ae1 authored by Colin Cross's avatar Colin Cross Committed by Automerger Merge Worker
Browse files

Merge changes Ifa4594ea,Ia756f309 am: d2694345 am: 9fe62908 

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

Change-Id: Ic68646858f160c0b9c6e97b0549d43d149cf8868
parents eb071827 9fe62908

cmd/multiproduct_kati/main.go

+1 −1
Original line number Diff line number Diff line
@@ -301,7 +301,7 @@ func main() { 
		jobs = runtime.NumCPU() / 4



		ramGb := int(detectTotalRAM() / (1024 * 1024 * 1024))

		if ramJobs := ramGb / 25; ramGb > 0 && jobs > ramJobs {

		if ramJobs := ramGb / 30; ramGb > 0 && jobs > ramJobs {

			jobs = ramJobs

		}

java/proto.go

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ import ( 
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

	// hitting command line length limits.

	shards := android.ShardPaths(protoFiles, 100)

	shards := android.ShardPaths(protoFiles, 50)



	srcJarFiles := make(android.Paths, 0, len(shards))