Upgrade oss-fuzz to 947169dc86572e121c3e138f366a9f39ac6266ae am: f3764d0712 am: 1117028736 am: 235e96b2f8android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-releaseandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-dev

Original change: https://android-review.googlesource.com/c/platform/external/oss-fuzz/+/1662261

Change-Id: Ib7b7a79b38e1261c1d5fb4ccb1a5dfd106588996

1 files changed, 0 insertions, 68 deletions

diff --git a/infra/go/coverage/pprof-merge/main.go b/infra/go/coverage/pprof-merge/main.go
deleted file mode 100644
index f35156403..000000000
--- a/infra/go/coverage/pprof-merge/main.go
+++ /dev/null
@@ -1,68 +0,0 @@
-// Copyright 2019 Google Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package main
-
-import (
-	"flag"
-	"log"
-	"os"
-
-	"github.com/google/pprof/profile"
-)
-
-var (
-	output string
-)
-
-func main() {
-	flag.StringVar(&output, "o", "merged.data", "")
-	flag.Parse()
-
-	files := os.Args[1:]
-	if len(files) == 0 {
-		log.Fatal("Give profiles files as arguments")
-	}
-
-	var profiles []*profile.Profile
-	for _, fname := range files {
-		f, err := os.Open(fname)
-		if err != nil {
-			log.Fatalf("Cannot open profile file at %q: %v", fname, err)
-		}
-		p, err := profile.Parse(f)
-		if err != nil {
-			log.Fatalf("Cannot parse profile at %q: %v", fname, err)
-		}
-		profiles = append(profiles, p)
-	}
-
-	merged, err := profile.Merge(profiles)
-	if err != nil {
-		log.Fatalf("Cannot merge profiles: %v", err)
-	}
-
-	out, err := os.OpenFile(output, os.O_RDWR|os.O_CREATE, 0755)
-	if err != nil {
-		log.Fatalf("Cannot open output to write: %v", err)
-	}
-
-	if err := merged.Write(out); err != nil {
-		log.Fatalf("Cannot write merged profile to file: %v", err)
-	}
-
-	if err := out.Close(); err != nil {
-		log.Printf("Error when closing the output file: %v", err)
-	}
-}