GN: Build libvpx

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 63 matching lines @@
       "-m", "x86",
     ]
   } else if (cpu_arch == "x64") {
     _yasm_flags = [
       "-fwin64",
       "-m", "amd64",
     ]
   }
 }
 
-# Default yasm include dirs. Make it match the native build (source root and
-# root generated code directory).
-_yasm_flags += [
-  "-I.",

[piman, 2014/09/18 20:14:57]

This (recently added) line was lost in the merge.

-  # Using "//." will produce a relative path "../.." which looks better than
-  # "../../" which will result from using "//" as the base (although both
-  # work). This is because rebase_path will terminate the result in a slash if
-  # the input ends in a slash.
-  "-I" + rebase_path("//.", root_build_dir),
-  "-I" + rebase_path(root_gen_dir, root_build_dir),
-]
-
 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")
 
@@ skipping 29 matching lines @@
     if (defined(invoker.deps)) {
       deps += invoker.deps
     }
 
     # Flags.
     args += _yasm_flags
     if (defined(invoker.yasm_flags)) {
       args += invoker.yasm_flags
     }
 
-    # Extra include directories.
+    # User defined include dirs go first.
     if (defined(invoker.include_dirs)) {
       foreach(include, invoker.include_dirs) {
         args += [ "-I" + rebase_path(include, root_build_dir) ]
       }
     }
 
+    # Default yasm include dirs. Make it match the native build (source root and
+    # root generated code directory).
+    # This goes to the end of include list.
+    args += [
+      # Using "//." will produce a relative path "../.." which looks better than
+      # "../../" which will result from using "//" as the base (although both
+      # work). This is because rebase_path will terminate the result in a
+      # slash if the input ends in a slash.
+      "-I" + rebase_path("//.", root_build_dir),
+      "-I" + rebase_path(root_gen_dir, root_build_dir),
+    ]
+
+
     # 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
@@ skipping 18 matching lines @@
   source_set(source_set_name) {
     if (defined(invoker.visibility)) {
       visibility = invoker.visibility
     }
 
     sources = get_target_outputs(":$action_name")
 
     deps = [ ":$action_name" ]
   }
 }