coffee/libyuv
1
0
Fork 0
mirror of https://chromium.googlesource.com/libyuv/libyuv synced 2025-12-07 01:06:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix standalone GN build.

Browse Source 
Add dependencies and move the neon target to only be
specified for ARM builds so a standalone GN build can be
performed.

TESTED=Ran:
gn gen out/Release --args=is_debug=false
ninja -C out/Release

gn gen out/Debug --args=is_debug=true
ninja -C out/Debug

gn gen out/Debug --args="is_debug=true os=\"android\" "cpu_arch=\"arm\""
ninja -C out/Debug

gn gen out/Release --args="is_debug=false os=\"android\" "cpu_arch=\"arm\""
ninja -C out/Release

R=fbarchard@google.com

Review URL: https://webrtc-codereview.appspot.com/42289004

git-svn-id: http://libyuv.googlecode.com/svn/trunk@1317 16f28f9a-4ce2-e073-06de-1de4eb20be90
This commit is contained in:
kjellander@google.com 2015-03-10 08:16:49 +00:00
parent 1d87532f00
commit 0e53718e01
3 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -14,6 +14,7 @@ third_party/
tools/android tools/android
tools/clang tools/clang
tools/find_depot_tools.py tools/find_depot_tools.py
tools/generate_library_loader
tools/gn tools/gn
tools/gyp tools/gyp
tools/memory tools/memory

6
BUILD.gn
View File

@ -15,6 +15,8 @@ config("libyuv_config") {
] ]
} }
use_neon = current_cpu == "arm" && (arm_use_neon || arm_optionally_use_neon)
source_set("libyuv") { source_set("libyuv") {
sources = [ sources = [
"include/libyuv.h", "include/libyuv.h",
@ -90,11 +92,12 @@ source_set("libyuv") {
"//third_party:jpeg", "//third_party:jpeg",
] ]
if (current_cpu == "arm" && (arm_use_neon || arm_optionally_use_neon)) { if (use_neon) {
deps += [ ":libyuv_neon" ] deps += [ ":libyuv_neon" ]
} }
} }
if (use_neon) {
static_library("libyuv_neon") { static_library("libyuv_neon") {
sources = [ sources = [
"source/compare_neon.cc", "source/compare_neon.cc",
@ -112,3 +115,4 @@ static_library("libyuv_neon") {
configs -= [ "//build/config/compiler:compiler_arm_fpu" ] configs -= [ "//build/config/compiler:compiler_arm_fpu" ]
cflags = [ "-mfpu=neon" ] cflags = [ "-mfpu=neon" ]
} }
}

2
setup_links.py
View File

@ -43,11 +43,13 @@ DIRECTORIES = [
'third_party/binutils', 'third_party/binutils',
'third_party/libjpeg', 'third_party/libjpeg',
'third_party/libjpeg_turbo', 'third_party/libjpeg_turbo',
'third_party/libudev',
'third_party/llvm-build', 'third_party/llvm-build',
'third_party/nss', 'third_party/nss',
'third_party/yasm', 'third_party/yasm',
'tools/android', 'tools/android',
'tools/clang', 'tools/clang',
'tools/generate_library_loader',
'tools/gn', 'tools/gn',
'tools/gyp', 'tools/gyp',
'tools/memory', 'tools/memory',