OLD | NEW |
1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 The Chromium Authors. All rights reserved. |
2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
4 | 4 |
5 import("//build/config/arm.gni") | 5 import("//build/config/arm.gni") |
6 import("//build/config/android/config.gni") | 6 import("//build/config/android/config.gni") |
7 import("//third_party/libvpx/libvpx_srcs.gni") | 7 import("//third_party/libvpx/libvpx_srcs.gni") |
8 import("//third_party/yasm/yasm_assemble.gni") | 8 import("//third_party/yasm/yasm_assemble.gni") |
9 | 9 |
10 if (is_posix && !is_mac) { | 10 if (is_posix && !is_mac) { |
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
164 configs += [ ":libvpx_config" ] | 164 configs += [ ":libvpx_config" ] |
165 cflags = [ "-msse4.1" ] | 165 cflags = [ "-msse4.1" ] |
166 if (cpu_arch == "x86") { | 166 if (cpu_arch == "x86") { |
167 sources = libvpx_srcs_x86_sse4_1 | 167 sources = libvpx_srcs_x86_sse4_1 |
168 } else if (cpu_arch == "x64") { | 168 } else if (cpu_arch == "x64") { |
169 sources = libvpx_srcs_x86_64_sse4_1 | 169 sources = libvpx_srcs_x86_64_sse4_1 |
170 } | 170 } |
171 } | 171 } |
172 | 172 |
173 # TOOD(hclam): NEON intrinsics are not building on GN yet. | 173 # TOOD(hclam): NEON intrinsics are not building on GN yet. |
174 if (cpu_arch_full == "arm-neon-cpu-detect" && media_use_libvpx) { | 174 #if (cpu_arch_full == "arm-neon-cpu-detect") { |
175 static_library("libvpx_intrinsics_neon") { | 175 # static_library("libvpx_intrinsics_neon") { |
176 configs += [ ":libvpx_config" ] | 176 # configs += [ ":libvpx_config" ] |
177 cflags = [ "-mfpu=neon", "-mfloat-abi=softfp" ] | 177 # cflags = [ "-mfpu=neon", "-mfloat-abi=softfp" ] |
178 sources = libvpx_srcs_arm_neon_cpu_detect_neon | 178 # sources = libvpx_srcs_arm_neon_cpu_detect_neon |
179 } | 179 # } |
180 } | 180 #} |
181 | 181 |
182 static_library("libvpx") { | 182 static_library("libvpx") { |
183 if (!is_debug && is_win && is_official_build) { | 183 if (!is_debug && is_win && is_official_build) { |
184 configs -= [ "//build/config/compiler:optimize" ] | 184 configs -= [ "//build/config/compiler:optimize" ] |
185 configs += [ "//build/config/compiler:optimize_max" ] | 185 configs += [ "//build/config/compiler:optimize_max" ] |
186 } | 186 } |
187 | 187 |
188 if (cpu_arch == "x86") { | 188 if (cpu_arch == "x86") { |
189 sources = libvpx_srcs_x86 | 189 sources = libvpx_srcs_x86 |
190 } else if (cpu_arch == "x64") { | 190 } else if (cpu_arch == "x64") { |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
224 if (cpu_arch == "arm") { | 224 if (cpu_arch == "arm") { |
225 deps += [ | 225 deps += [ |
226 # TODO(hclam): GN build doesn't compile NEON intrinsics because | 226 # TODO(hclam): GN build doesn't compile NEON intrinsics because |
227 # -mfpu=vfpv3-d16 needs to be removed. | 227 # -mfpu=vfpv3-d16 needs to be removed. |
228 # ":libvpx_intrinsics_neon" | 228 # ":libvpx_intrinsics_neon" |
229 ] | 229 ] |
230 } | 230 } |
231 deps += [ "//third_party/android_tools:cpu_features" ] | 231 deps += [ "//third_party/android_tools:cpu_features" ] |
232 } | 232 } |
233 } | 233 } |
OLD | NEW |