Fix some TODOs in the yasm build.

third_party/yasm/yasm_assemble.gni

 # 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.
 
 # This provides the yasm_assemble() template which uses YASM to assemble
 # assembly files.
 #
 # Files to be assembled with YASM should have an extension of .asm.
 #
 # Parameters
@@ skipping 76 matching lines @@
   }
 }
 
 if (is_win) {
   asm_obj_extension = "obj"
 } else {
   asm_obj_extension = "o"
 }
 
 template("yasm_assemble") {
-  # TODO(ajwong): Support use_system_yasm.
   assert(defined(invoker.sources), "Need sources defined for $target_name")
 
   # Only depend on YASM on x86 systems. Force compilation of .asm files for
   # ARM to fail.
   assert(current_cpu == "x86" || current_cpu == "x64")
 
   action_name = "${target_name}_action"
   source_set_name = target_name
 
   action_foreach(action_name) {
@@ skipping 51 matching lines @@
     ]
 
     # Extra defines.
     if (defined(invoker.defines)) {
       foreach(def, invoker.defines) {
         args += [ "-D$def" ]
       }
     }
 
     # Output file.
-    #
-    # TODO(brettw) it might be nice if there was a source expansion for the
-    # path of the source file relative to the source root. Then we could
-    # exactly duplicate the naming and location of object files from the
-    # native build, which would be:
-    # "$root_out_dir/${target_name}.{{source_dir_part}}.$asm_obj_extension"
     outputs = [
-      "$target_out_dir/{{source_name_part}}.o",
+      "$target_out_dir/$source_set_name/{{source_name_part}}.o",
     ]
     args += [
       "-o",
       rebase_path(outputs[0], root_build_dir),
       "{{source}}",
     ]
 
     # The wrapper script run_yasm will write the depfile to the same name as
     # the output but with .d appended (like gcc will).
     depfile = outputs[0] + ".d"
   }
 
   # Gather the .o files into a linkable thing. This doesn't actually link
   # anything (a source set just compiles files to link later), but will pass
   # the object files generated by the action up the dependency chain.
   source_set(source_set_name) {
     if (defined(invoker.visibility)) {
       visibility = invoker.visibility
     }
 
     sources = get_target_outputs(":$action_name")
 
     deps = [
       ":$action_name",
     ]
   }
 }