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
ecb66270
Commit
ecb66270
authored
Aug 30, 2016
by
Thomas Guillem
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
build: update toolchain if ndk changes
parent
d1eb581b
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
0 deletions
+12
-0
compile-libvlc.sh
compile-libvlc.sh
+12
-0
No files found.
compile-libvlc.sh
View file @
ecb66270
...
...
@@ -285,19 +285,31 @@ else
exit
1
fi
NDK_FORCE_ARG
=
NDK_TOOLCHAIN_DIR
=
${
PWD
}
/toolchains/
${
PLATFORM_SHORT_ARCH
}
NDK_TOOLCHAIN_PROPS
=
${
NDK_TOOLCHAIN_DIR
}
/source.properties
NDK_TOOLCHAIN_PATH
=
${
NDK_TOOLCHAIN_DIR
}
/bin
NDK_SUPPORT_DIR
=
${
NDK_TOOLCHAIN_DIR
}
/include/support
if
[
"
`
cat
\"
${
NDK_TOOLCHAIN_PROPS
}
\"
2>/dev/null
`
"
!=
"
`
cat
\"
${
ANDROID_NDK
}
/source.properties
\"
`
"
]
;
then
echo
"NDK changed, making new toolchain"
NDK_FORCE_ARG
=
"--force"
fi
$ANDROID_NDK
/build/tools/make_standalone_toolchain.py
\
--arch
${
PLATFORM_SHORT_ARCH
}
\
--api
${
ANDROID_API
}
\
--stl
libc++
\
${
NDK_FORCE_ARG
}
\
--install-dir
${
NDK_TOOLCHAIN_DIR
}
2> /dev/null
if
[
!
-d
${
NDK_TOOLCHAIN_PATH
}
]
;
then
echo
"make_standalone_toolchain.py failed"
exit
1
fi
if
[
!
-z
"
${
NDK_FORCE_ARG
}
"
]
;
then
cp
"
$ANDROID_NDK
/source.properties"
"
${
NDK_TOOLCHAIN_PROPS
}
"
fi
if
[
!
-f
${
NDK_TOOLCHAIN_DIR
}
/sysroot/usr/include/uchar.h
]
;
then
cp
${
ANDROID_NDK
}
/platforms/android-24/arch-
${
PLATFORM_SHORT_ARCH
}
/usr/include/uchar.h
\
...
...
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