Add ability to only upload a single Chromium build and check for patch existence

ct/go/util/chromium_builds.go

 // Utility to create and manage chromium builds.
 package util
 
 import (
         "fmt"
         "io/ioutil"
         "os"
         "path/filepath"
         "runtime"
 
@@ skipping 23 matching lines @@
 // CreateChromiumBuild creates a chromium build using the specified arguments.
 
 // runID is the unique id of the current run (typically requester + timestamp).
 // targetPlatform is the platform the benchmark will run on (Android / Linux ).
 // chromiumHash is the hash the checkout should be synced to. If not specified then
 // Chromium's Tot hash is used.
 // skiaHash is the hash the checkout should be synced to. If not specified then
 // Skia's LKGR hash is used (the hash in Chromium's DEPS file).
 // applyPatches if true looks for Chromium/Skia patches in the temp dir and
 // runs once with the patch applied and once without the patch applied.
-func CreateChromiumBuild(runID, targetPlatform, chromiumHash, skiaHash string, applyPatches bool) (string, string, error) {
+// uploadSingleBuild if true does not upload a 2nd build of Chromium.
+func CreateChromiumBuild(runID, targetPlatform, chromiumHash, skiaHash string, applyPatches, uploadSingleBuild bool) (string, string, error) {
         // Determine which build dir and fetch target to use.
         var chromiumBuildDir, fetchTarget string
         if targetPlatform == "Android" {
                 chromiumBuildDir = filepath.Join(ChromiumBuildsDir, "android_base")
                 fetchTarget = "android"
         } else if targetPlatform == "Linux" {
                 chromiumBuildDir = filepath.Join(ChromiumBuildsDir, "linux_base")
                 fetchTarget = "chromium"
         } else {
                 return "", "", fmt.Errorf("Unrecognized target_platform %s", targetPlatform)
@@ skipping 61 matching lines @@
 
         // Upload to Google Storage.
         gs, err := NewGsUtil(nil)
         if err != nil {
                 return "", "", fmt.Errorf("Could not create GS object: %s", err)
         }
         if err := uploadChromiumBuild(filepath.Join(chromiumBuildDir, "src", "out", "Release"), filepath.Join(CHROMIUM_BUILDS_DIR_NAME, googleStorageDirName), targetPlatform, gs); err != nil {
                 return "", "", fmt.Errorf("There was an error uploaded the chromium build dir %s: %s", filepath.Join(chromiumBuildDir, "src", "out", "Release"), err)
         }
 
-        // Check for the applypatch flag and reset and then build again and copy to
-        // google storage.
-        if applyPatches {
-                // Now build chromium without the patches and upload it to Google Storage.
-
+        // Create and upload another chromium build if the uploadSingleBuild flag is false. This build
+        // will be created without applying patches.
+        if !uploadSingleBuild {
                 // Make sure we are starting from a clean slate.
                 if err := resetChromiumCheckout(filepath.Join(chromiumBuildDir, "src")); err != nil {
                         return "", "", fmt.Errorf("Could not reset the chromium checkout in %s: %s", chromiumBuildDir, err)
                 }
                 // Build chromium.
                 if err := buildChromium(chromiumBuildDir, targetPlatform); err != nil {
                         return "", "", fmt.Errorf("There was an error building chromium %s + skia %s: %s", chromiumHash, skiaHash, err)
                 }
                 // Upload to Google Storage.
                 googleStorageDirName = fmt.Sprintf("try-%s-%s-%s-nopatch", getTruncatedHash(chromiumHash), getTruncatedHash(skiaHash), runID)
@@ skipping 100 matching lines @@
                 return fmt.Errorf("Could not reset Skia's checkout in %s: %s", skiaDir, err)
         }
         // Reset Chromium.
         if err := ResetCheckout(chromiumSrcDir); err != nil {
                 return fmt.Errorf("Could not reset Chromium's checkout in %s: %s", chromiumSrcDir, err)
         }
         return nil
 }
 
 func applyRepoPatches(chromiumSrcDir, runID string) error {
-        // Apply Skia patch.
+        // Apply Skia patch if it exists.
         skiaDir := filepath.Join(chromiumSrcDir, "third_party", "skia")
         skiaPatch := filepath.Join(os.TempDir(), runID+".skia.patch")
-        skiaPatchFile, _ := os.Open(skiaPatch)
-        skiaPatchFileInfo, _ := skiaPatchFile.Stat()
-        if skiaPatchFileInfo.Size() > 10 {
-                if err := ApplyPatch(skiaPatch, skiaDir); err != nil {
-                        return fmt.Errorf("Could not apply Skia's patch in %s: %s", skiaDir, err)
+        if _, err := os.Stat(skiaPatch); err == nil {
+                skiaPatchFile, _ := os.Open(skiaPatch)
+                skiaPatchFileInfo, _ := skiaPatchFile.Stat()
+                if skiaPatchFileInfo.Size() > 10 {
+                        if err := ApplyPatch(skiaPatch, skiaDir); err != nil {
+                                return fmt.Errorf("Could not apply Skia's patch in %s: %s", skiaDir, err)
+                        }
                 }
         }
-        // Apply Chromium patch.
+        // Apply Chromium patch if it exists.
         chromiumPatch := filepath.Join(os.TempDir(), runID+".chromium.patch")
-        chromiumPatchFile, _ := os.Open(chromiumPatch)
-        chromiumPatchFileInfo, _ := chromiumPatchFile.Stat()
-        if chromiumPatchFileInfo.Size() > 10 {
-                if err := ApplyPatch(chromiumPatch, chromiumSrcDir); err != nil {
-                        return fmt.Errorf("Could not apply Chromium's patch in %s: %s", chromiumSrcDir, err)
+        if _, err := os.Stat(chromiumPatch); err == nil {
+                chromiumPatchFile, _ := os.Open(chromiumPatch)
+                chromiumPatchFileInfo, _ := chromiumPatchFile.Stat()
+                if chromiumPatchFileInfo.Size() > 10 {
+                        if err := ApplyPatch(chromiumPatch, chromiumSrcDir); err != nil {
+                                return fmt.Errorf("Could not apply Chromium's patch in %s: %s", chromiumSrcDir, err)
+                        }
                 }
         }
         return nil
 }
 
 func InstallChromeAPK(chromiumBuildName string) error {
         // Install the APK on the Android device.
         chromiumApk := filepath.Join(ChromiumBuildsDir, chromiumBuildName, ApkName)
         glog.Infof("Installing the APK at %s", chromiumApk)
         err := ExecuteCmd(BINARY_ADB, []string{"install", "-r", chromiumApk}, []string{},
                 ADB_INSTALL_TIMEOUT, nil, nil)
         if err != nil {
                 return fmt.Errorf("Could not install the chromium APK at %s: %s", chromiumBuildName, err)
         }
         return nil
 }