GN & libvpx: Missing deps for generating ASM offsets

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("//third_party/libvpx/libvpx_srcs.gni")
 import("//third_party/yasm/yasm_assemble.gni")
 
 if (is_posix && !is_mac) {
@@ skipping 109 matching lines @@
       sources = libvpx_srcs_x86_64_assembly
     }
 
     defines = [ "CHROMIUM" ]
     include_dirs = [
       "//third_party/libvpx/source/config/$os_category/$cpu_arch_full",
       "//third_party/libvpx/source/config",
      "//third_party/libvpx/source/libvpx",
       target_gen_dir
     ]
+    deps = [
+      ":gen_asm_offsets_vp8",
+      ":gen_asm_offsets_scale",
+    ]
   }
 }
 
 static_library("libvpx_intrinsics_mmx") {
   configs += [ ":libvpx_config" ]
   cflags = [ "-mmmx" ]
   if (cpu_arch == "x86") {
     sources = libvpx_srcs_x86_mmx
   } else if (cpu_arch == "x64") {
     sources = libvpx_srcs_x86_64_mmx
@@ skipping 55 matching lines @@
       "-s",
       rebase_path("//third_party/libvpx/source/libvpx/build/make/ads2gas.pl",
                   root_build_dir),
       "-i", "{{source}}",
       "-o", rebase_path("$target_gen_dir/{{source_name_part}}.S")
     ]
   }
 
   static_library("libvpx_assembly_arm") {
     sources = get_target_outputs(":convert_arm_assembly")
-    deps = [ ":convert_arm_assembly" ]
     configs -= [ "//build/config/compiler:compiler_arm_fpu" ]
     configs += [ ":libvpx_config" ]
     if (cpu_arch_full == "arm-neon" ||
         cpu_arch_full == "arm-neon-cpu-detect") {
       cflags = [ "-mfpu=neon" ]
     }
+    deps = [
+      ":convert_arm_assembly",
+      ":gen_asm_offsets_vp8",
+      ":gen_asm_offsets_scale",
+    ]
   }
 }
 
 static_library("libvpx") {
   if (!is_debug && is_win && is_official_build) {
     configs -= [ "//build/config/compiler:optimize" ]
     configs += [ "//build/config/compiler:optimize_max" ]
   }
 
   if (cpu_arch == "x86") {
@@ skipping 10 matching lines @@
     if (arm_use_neon) {
       sources = libvpx_srcs_arm_neon
     } else if (is_android) {
       sources = libvpx_srcs_arm_neon_cpu_detect
     } else {
       sources = libvpx_srcs_arm
     }
   } else if (cpu_arch == "arm64") {
     sources = libvpx_srcs_arm64
   }
-  deps = [
-    ":gen_asm_offsets_vp8",
-  ]
   configs += [ ":libvpx_config" ]
+  deps = []
   if (cpu_arch == "x86" || (cpu_arch == "x64" && !is_msan)) {
     deps += [
       ":libvpx_yasm",
       ":libvpx_intrinsics_mmx",
       ":libvpx_intrinsics_sse2",
       ":libvpx_intrinsics_ssse3",
       ":libvpx_intrinsics_sse4_1",
     ]
   }
   if (cpu_arch_full == "arm-neon-cpu-detect") {
     deps += [ ":libvpx_intrinsics_neon" ]
   }
   if (is_android) {
     deps += [ "//third_party/android_tools:cpu_features" ]
   }
   if (cpu_arch == "arm") {
     deps += [ ":libvpx_assembly_arm" ]
   }
 }