Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
BC
public
linphone-cmake-builder
Commits
1bff470d
Commit
1bff470d
authored
Apr 13, 2016
by
Gautier Pelloux-Prayer
Browse files
android: quit with error when trying to build vpx on arm and fix video deactivation on arm
parent
95b7669a
Changes
2
Hide whitespace changes
Inline
Side-by-side
builders/vpx.cmake
View file @
1bff470d
...
...
@@ -115,9 +115,9 @@ else()
endif
()
set
(
EP_vpx_LINKING_TYPE
"--enable-static"
"--disable-shared"
"--enable-pic"
)
elseif
(
ANDROID
)
string
(
FIND
"
${
CMAKE_SYSTEM_PROCESSOR
}
"
"armeabi"
ARM_POSITION
)
# if we are building for arm or
arm
v7
if
(
${
ARM_POSITION
}
EQUAL 0
)
if
(
CMAKE_SYSTEM_PROCESSOR
STREQUAL
"armeabi"
)
message
(
FATAL_ERROR
"VPX cannot be built on
arm
."
)
elseif
(
CMAKE_SYSTEM_PROCESSOR STREQUAL
"armeabi-v7a"
)
set
(
EP_vpx_TARGET
"armv7-android-gcc"
)
else
()
set
(
EP_vpx_TARGET
"x86-android-gcc"
)
...
...
configs/config-android.cmake
View file @
1bff470d
...
...
@@ -49,14 +49,13 @@ set(LINPHONE_BUILDER_HOST "${CMAKE_SYSTEM_PROCESSOR}-linux-android")
set
(
CMAKE_INSTALL_RPATH
"$ORIGIN"
)
if
(
CMAKE_SYSTEM_PROCESSOR STREQUAL
"armeabi"
AND ENABLE_VIDEO
)
message
(
STATUS
"Disabling video for armv6"
)
set
(
ENABLE_VIDEO NO CACHE BOOL
""
)
set
(
ENABLE_FFMPEG NO CACHE BOOL
""
)
set
(
ENABLE_OPENH264 NO CACHE BOOL
""
)
set
(
ENABLE_VPX NO CACHE BOOL
""
)
set
(
ENABLE_X264 NO CACHE BOOL
""
)
set
(
ENABLE_VIDEO NO CACHE BOOL
""
FORCE
)
set
(
ENABLE_FFMPEG NO CACHE BOOL
""
FORCE
)
set
(
ENABLE_OPENH264 NO CACHE BOOL
""
FORCE
)
set
(
ENABLE_VPX NO CACHE BOOL
""
FORCE
)
set
(
ENABLE_X264 NO CACHE BOOL
""
FORCE
)
endif
()
# Include builders
include
(
builders/CMakeLists.txt
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment