Enable AVX2 in 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("//third_party/libvpx/libvpx_srcs.gni")
 import("//third_party/yasm/yasm_assemble.gni")
 
 if (is_posix && !is_mac) {
@@ skipping 109 matching lines @@
   if (!is_win) {
     cflags = [ "-msse4.1" ]
   }
   if (cpu_arch == "x86") {
     sources = libvpx_srcs_x86_sse4_1
   } else if (cpu_arch == "x64") {
     sources = libvpx_srcs_x86_64_sse4_1
   }
 }
 
-# Uncomment when enabling AVX2
-#static_library("libvpx_intrinsics_avx2") {
-#  configs += [ ":libvpx_config" ]
-#  configs -= [ "//build/config/compiler:chromium_code" ]
-#  configs += [ "//build/config/compiler:no_chromium_code" ]
-#  if (is_win) {
-#    cflags = [ "/arch:AVX2" ]
-#  } else {
-#    cflags = [ "-mavx2" ]
-#  }
-#  if (cpu_arch == "x86") {
-#    sources = libvpx_srcs_x86_avx2
-#  } else if (cpu_arch == "x64") {
-#    sources = libvpx_srcs_x86_64_avx2
-#  }
-#}
+static_library("libvpx_intrinsics_avx2") {
+  configs += [ ":libvpx_config" ]
+  configs -= [ "//build/config/compiler:chromium_code" ]
+  configs += [ "//build/config/compiler:no_chromium_code" ]
+  if (is_win) {
+    cflags = [ "/arch:AVX2" ]
+  } else {
+    cflags = [ "-mavx2" ]
+  }
+  if (cpu_arch == "x86") {
+    sources = libvpx_srcs_x86_avx2
+  } else if (cpu_arch == "x64") {
+    sources = libvpx_srcs_x86_64_avx2
+  }
+}
 
 if (cpu_arch_full == "arm-neon-cpu-detect") {
   static_library("libvpx_intrinsics_neon") {
     configs -= [ "//build/config/compiler:compiler_arm_fpu" ]
     configs += [ ":libvpx_config" ]
     cflags = [ "-mfpu=neon" ]
     sources = libvpx_srcs_arm_neon_cpu_detect_neon
   }
 }
 
@@ skipping 74 matching lines @@
   configs += [ "//build/config/compiler:no_chromium_code" ]
   configs += [ ":libvpx_warnings" ]
   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",
-      #":libvpx_intrinsics_avx2",
+      ":libvpx_intrinsics_avx2",
     ]
   }
   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" ]
   }
 
   public_configs = [ ":libvpx_external_config" ]
 }