Commit d8da5644 authored by Hugo Beauzée-Luyssen's avatar Hugo Beauzée-Luyssen
Browse files

vlc-debian-android: Don't hardcode path to tools

And remove bits that were from specific to my machine
parent 772a78a8
Pipeline #15121 failed with stage
in 9 minutes and 44 seconds
......@@ -2,7 +2,7 @@ FROM debian:buster-20200224
MAINTAINER VideoLAN roots <roots@videolan.org>
ENV IMAGE_DATE=202003110812
ENV IMAGE_DATE=202023031031
COPY crossfiles/ /opt/crossfiles/
......@@ -16,7 +16,7 @@ ENV ANDROID_NDK="/sdk/android-ndk" \
# - RPM based: <500 (CentOS, RedHat, etc.)
ARG VIDEOLAN_CI_UID=499
ENV PATH=/usr/lib/jvm/java-8-openjdk-amd64/bin:$PATH
ENV PATH=/usr/lib/jvm/java-8-openjdk-amd64/bin:/sdk/android-ndk/toolchains/llvm/prebuilt/linux-x86_64/bin/:$PATH
RUN addgroup --quiet --gid ${VIDEOLAN_CI_UID} videolan && \
adduser --quiet --uid ${VIDEOLAN_CI_UID} --ingroup videolan videolan && \
......
# Automatically generated by contrib makefile
[binaries]
c = '/sdk/android-ndk/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android21-clang'
cpp = '/sdk/android-ndk/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android21-clang++'
ar = '/sdk/android-ndk/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android-ar'
c = 'aarch64-linux-android21-clang'
cpp = 'aarch64-linux-android21-clang++'
ar = 'aarch64-linux-android-ar'
strip = 'aarch64-linux-android-strip'
pkgconfig = 'pkg-config'
windres = 'aarch64-linux-android-windres'
[properties]
needs_exe_wrapper = true
c_args = ['-g', '-O2', '-fPIC', '-fdata-sections', '-ffunction-sections', '-funwind-tables', '-fstack-protector-strong', '-no-canonical-prefixes', '-I/home/chouquette/dev/vlc/contrib/aarch64-linux-android/include']
c_link_args = ['-L/home/chouquette/dev/vlc/contrib/aarch64-linux-android/lib']
cpp_args = ['-g', '-O2', '-fPIC', '-fdata-sections', '-ffunction-sections', '-funwind-tables', '-fstack-protector-strong', '-no-canonical-prefixes', '-I/home/chouquette/dev/vlc/contrib/aarch64-linux-android/include', '-fexceptions', '-frtti']
cpp_link_args = ['-L/home/chouquette/dev/vlc/contrib/aarch64-linux-android/lib']
c_args = ['-g', '-O2', '-fPIC', '-fdata-sections', '-ffunction-sections', '-funwind-tables', '-fstack-protector-strong', '-no-canonical-prefixes']
cpp_args = ['-g', '-O2', '-fPIC', '-fdata-sections', '-ffunction-sections', '-funwind-tables', '-fstack-protector-strong', '-no-canonical-prefixes', '-fexceptions', '-frtti']
[host_machine]
system = 'android'
......
# Automatically generated by contrib makefile
[binaries]
c = '/sdk/android-ndk/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi17-clang'
cpp = '/sdk/android-ndk/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi17-clang++'
ar = '/sdk/android-ndk/toolchains/llvm/prebuilt/linux-x86_64/bin/arm-linux-androideabi-ar'
c = 'armv7a-linux-androideabi17-clang'
cpp = 'armv7a-linux-androideabi17-clang++'
ar = 'arm-linux-androideabi-ar'
strip = 'arm-linux-androideabi-strip'
pkgconfig = 'pkg-config'
windres = 'arm-linux-androideabi-windres'
[properties]
needs_exe_wrapper = true
c_args = ['-g', '-O2', '-fPIC', '-fdata-sections', '-ffunction-sections', '-funwind-tables', '-fstack-protector-strong', '-no-canonical-prefixes', '-I/home/chouquette/dev/vlc/contrib/arm-linux-androideabi/include']
c_link_args = ['-L/home/chouquette/dev/vlc/contrib/arm-linux-androideabi/lib']
cpp_args = ['-g', '-O2', '-fPIC', '-fdata-sections', '-ffunction-sections', '-funwind-tables', '-fstack-protector-strong', '-no-canonical-prefixes', '-I/home/chouquette/dev/vlc/contrib/arm-linux-androideabi/include', '-fexceptions', '-frtti']
cpp_link_args = ['-L/home/chouquette/dev/vlc/contrib/arm-linux-androideabi/lib']
c_args = ['-g', '-O2', '-fPIC', '-fdata-sections', '-ffunction-sections', '-funwind-tables', '-fstack-protector-strong', '-no-canonical-prefixes', '-U_FILE_OFFSET_BITS']
cpp_args = ['-g', '-O2', '-fPIC', '-fdata-sections', '-ffunction-sections', '-funwind-tables', '-fstack-protector-strong', '-no-canonical-prefixes', '-fexceptions', '-frtti']
[host_machine]
system = 'android'
cpu_family = 'arm'
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment