Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Ewout ter Hoeven
VLC-Android
Commits
c8dccbaf
Commit
c8dccbaf
authored
Oct 20, 2014
by
Thomas Guillem
Browse files
Revert "build: move ndk fixup into configure.sh"
This reverts commit
0a79ed07
.
parent
0a79ed07
Changes
2
Hide whitespace changes
Inline
Side-by-side
compile.sh
View file @
c8dccbaf
...
...
@@ -314,6 +314,23 @@ else
TARGET
=
fi
# ANDROID NDK FIXUP (BLAME GOOGLE)
config_undef
()
{
sed
-i
's,#define '
$1
' 1,/\* #undef '
$1
' \*/,'
config.h
}
if
[
${
ANDROID_ABI
}
=
"x86"
-a
${
ANDROID_API
}
!=
"android-21"
]
;
then
# NDK x86 libm.so has nanf symbol but no nanf definition, we don't known if
# intel devices has nanf. Assume they don't have it.
config_undef HAVE_NANF
fi
if
[
${
ANDROID_API
}
=
"android-21"
]
;
then
# android-21 has empty sys/shm.h headers that triggers shm detection but it
# doesn't have any shm functions and/or symbols. */
config_undef HAVE_SYS_SHM_H
fi
echo
"Building"
make
$MAKEFLAGS
...
...
configure.sh
View file @
c8dccbaf
...
...
@@ -113,20 +113,3 @@ sh $VLC_SOURCEDIR/configure --host=$TARGET_TUPLE --build=x86_64-unknown-linux $E
--disable-x264
\
--disable-schroedinger
--disable-dirac
\
$*
# ANDROID NDK FIXUP (BLAME GOOGLE)
config_undef
()
{
sed
-i
's,#define '
$1
' 1,/\* #undef '
$1
' \*/,'
config.h
}
if
[
${
ANDROID_ABI
}
=
"x86"
-a
${
ANDROID_API
}
!=
"android-21"
]
;
then
# NDK x86 libm.so has nanf symbol but no nanf definition, we don't known if
# intel devices has nanf. Assume they don't have it.
config_undef HAVE_NANF
fi
if
[
${
ANDROID_API
}
=
"android-21"
]
;
then
# android-21 has empty sys/shm.h headers that triggers shm detection but it
# doesn't have any shm functions and/or symbols. */
config_undef HAVE_SYS_SHM_H
fi
Write
Preview
Supports
Markdown
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