Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
VideoLAN
VLC-Android
Commits
1f92c11c
Commit
1f92c11c
authored
Feb 04, 2015
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove unused HAVE_X86 variable
parent
f307fbf1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
7 deletions
+0
-7
compile-libvlc.sh
compile-libvlc.sh
+0
-2
compile.sh
compile.sh
+0
-5
No files found.
compile-libvlc.sh
View file @
1f92c11c
...
...
@@ -26,12 +26,10 @@ done
if
[
${
ANDROID_ABI
}
=
"x86"
]
;
then
TARGET_TUPLE
=
"i686-linux-android"
PATH_HOST
=
"x86"
HAVE_X86
=
1
PLATFORM_SHORT_ARCH
=
"x86"
elif
[
${
ANDROID_ABI
}
=
"x86_64"
]
;
then
TARGET_TUPLE
=
"x86_64-linux-android"
PATH_HOST
=
"x86_64"
HAVE_X86
=
1
HAVE_64
=
1
PLATFORM_SHORT_ARCH
=
"x86_64"
elif
[
${
ANDROID_ABI
}
=
"mips"
]
;
then
...
...
compile.sh
View file @
1f92c11c
...
...
@@ -54,19 +54,16 @@ if [ "$BUILD" = 0 -a "$FETCH" = 0 ];then
fi
HAVE_ARM
=
0
HAVE_X86
=
0
HAVE_64
=
0
# Set up ABI variables
if
[
${
ANDROID_ABI
}
=
"x86"
]
;
then
TARGET_TUPLE
=
"i686-linux-android"
PATH_HOST
=
"x86"
HAVE_X86
=
1
PLATFORM_SHORT_ARCH
=
"x86"
elif
[
${
ANDROID_ABI
}
=
"x86_64"
]
;
then
TARGET_TUPLE
=
"x86_64-linux-android"
PATH_HOST
=
"x86_64"
HAVE_X86
=
1
HAVE_64
=
1
PLATFORM_SHORT_ARCH
=
"x86_64"
elif
[
${
ANDROID_ABI
}
=
"mips"
]
;
then
...
...
@@ -120,7 +117,6 @@ EOF
export
TARGET_TUPLE
export
PATH_HOST
export
HAVE_ARM
export
HAVE_X86
export
HAVE_64
export
PLATFORM_SHORT_ARCH
...
...
@@ -257,7 +253,6 @@ echo "export PATH=$NDK_TOOLCHAIN_PATH:\${ANDROID_SDK}/platform-tools:\${PATH}" >
# CPU flags
echo
"export HAVE_ARM=
${
HAVE_ARM
}
"
>>
env.sh
echo
"export HAVE_X86=
${
HAVE_X86
}
"
>>
env.sh
echo
"export NO_ARMV6=
${
NO_ARMV6
}
"
>>
env.sh
echo
"export NO_FPU=
${
NO_FPU
}
"
>>
env.sh
...
...
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