Roll src/third_party/libvpx/source/libvpx/ 9a032fa26..1961a92a9 (33 commits).

third_party/libvpx/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("//build/config/arm.gni")
 import("//build/config/android/config.gni")
 import("//build/config/sanitizers/sanitizers.gni")
 import("//third_party/libvpx/libvpx_srcs.gni")
 import("//third_party/yasm/yasm_assemble.gni")
 
@@ skipping 210 matching lines @@
   } else {
     arm_assembly_sources = libvpx_srcs_arm_assembly
   }
 }
 
 # Converts ARM assembly files to GAS style.
 if (current_cpu == "arm" && arm_assembly_sources != []) {
   action_foreach("convert_arm_assembly") {
     script = "//third_party/libvpx/run_perl.py"
     sources = arm_assembly_sources
+    gen_file =
+        get_label_info("//third_party/libvpx/source/libvpx", "root_gen_dir") +
+        "/{{source_root_relative_dir}}/{{source_file_part}}.S"
     outputs = [
-      "$target_gen_dir/{{source_name_part}}.S",
+      gen_file,
     ]
     if (is_ios) {
       ads2gas_script =
           "//third_party/libvpx/source/libvpx/build/make/ads2gas_apple.pl"
     } else {
       ads2gas_script =
           "//third_party/libvpx/source/libvpx/build/make/ads2gas.pl"
     }
     args = [
       "-s",
       rebase_path(ads2gas_script, root_build_dir),
       "-i",
       "{{source}}",
       "-o",
-      rebase_path("$target_gen_dir/{{source_name_part}}.S"),
+      rebase_path(gen_file),
     ]
   }
 
   static_library("libvpx_assembly_arm") {
     sources = get_target_outputs(":convert_arm_assembly")
     configs -= [ "//build/config/compiler:compiler_arm_fpu" ]
     configs += [ ":libvpx_config" ]
     configs += [ ":libvpx_warnings" ]
     if (cpu_arch_full == "arm-neon" || cpu_arch_full == "arm-neon-cpu-detect") {
       asmflags = [ "-mfpu=neon" ]
+
+      # allow asm files to include generated sources which match the source
+      # tree layout, e.g., vpx_dsp/arm/...
+      include_dirs = [ get_label_info("//third_party/libvpx/source/libvpx",
+                                      "target_gen_dir") ]
     }
     deps = [
       ":convert_arm_assembly",
     ]
   }
 }
 
 static_library("libvpx") {
   if (!is_debug && is_win) {
     configs -= [ "//build/config/compiler:default_optimization" ]
@@ skipping 45 matching lines @@
   }
   if (is_android) {
     deps += [ "//third_party/android_tools:cpu_features" ]
   }
   if (current_cpu == "arm" && arm_assembly_sources != []) {
     deps += [ ":libvpx_assembly_arm" ]
   }
 
   public_configs = [ ":libvpx_external_config" ]
 }