Fix the courgette64 copy rules.

courgette/BUILD.gn

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//testing/test.gni")
 
 static_library("courgette_lib") {
   sources = [
     "adjustment_method.cc",
     "adjustment_method.h",
@@ skipping 91 matching lines @@
     ]
 
     deps = [
       ":courgette_lib",
       "//base",
       "//build/config/sanitizers:deps",
       "//build/win:default_exe_manifest",
     ]
   }
 
-  # The official build scripts expect courgette.exe to be in the official build
-  # archives but it's not clear if they really need it, copy courgette64.exe to
-  # courgette.exe to work around this. https://crbug.com/629243
-  if (is_win && current_cpu == "x64") {
-    copy("copy_courgette64_to_courgette") {
-      sources = [
-        "$root_out_dir/courgette64.exe",
-      ]
-      outputs = [
-        "$root_out_dir/courgette.exe",
-      ]
-      deps = [
-        ":courgette",
-      ]
+  if (is_win) {
+    if (current_cpu == "x64") {
+      # TODO(sebmarchand): The official build scripts expect courgette.exe to be
+      # in the official build archives, remove this once they have been updated.
+      # https://crbug.com/629243
+      copy("copy_courgette_binaries") {
+        sources = [
+          "$root_out_dir/courgette64.exe",
+        ]
+        outputs = [
+          "$root_out_dir/courgette.exe",
+        ]
+        deps = [
+          ":courgette",
+        ]
+      }
+    } else {
+      # Make sure that we have a copy of courgette64.exe in the root out
+      # directory.
+      copy("copy_courgette_binaries") {
+        sources = [
+          "$root_out_dir/x64/courgette64.exe",

[Will Harris, 2016/07/20 22:23:30]

where is this file emitted from?

[Dirk Pranke, 2016/07/20 22:37:41]

The :courgette(//build/toolchain/win:x64) dependency on line 139 produces that
file.

You could perhaps make this clearer by writing:

  _courgette64 = ":courgette(//build/toolchain/win:x64)"

  sources = get_target_outputs(_courgette64)
  deps = [ _courgette64 ]

+        ]
+        outputs = [
+          "$root_out_dir/courgette64.exe",
+        ]
+        deps = [
+          ":courgette(//build/toolchain/win:x64)",
+        ]
+      }
     }
   }
 }
 
 test("courgette_unittests") {
   sources = [
     "adjustment_method_unittest.cc",
     "base_test_unittest.cc",
     "base_test_unittest.h",
     "bsdiff_memory_unittest.cc",
@@ skipping 42 matching lines @@
     "encoded_program_fuzz_unittest.cc",
   ]
   deps = [
     ":courgette_lib",
     "//base",
     "//base:i18n",
     "//base/test:test_support",
     "//testing/gtest",
   ]
 }