Copy natives correctly on linux/arm64 & linux/arm/v6

This commit is contained in:
FriwiDev 2021-11-23 23:13:26 +01:00
parent 9940b72ee3
commit 4d5de16f09
2 changed files with 6 additions and 0 deletions

View File

@ -15,6 +15,8 @@ WORKDIR /builder
COPY jcef /jcef COPY jcef /jcef
#Copy prebuild classes, if any #Copy prebuild classes, if any
COPY out/linux* /prebuild COPY out/linux* /prebuild
#Copy additional natives
COPY natives /natives
#Copy and launch run script #Copy and launch run script
COPY scripts/run_linux.sh . COPY scripts/run_linux.sh .

View File

@ -65,8 +65,12 @@ fi
if [ ${TARGETARCH} == 'amd64' ] || [ ${TARGETARCH} == 'arm64' ]; then if [ ${TARGETARCH} == 'amd64' ] || [ ${TARGETARCH} == 'arm64' ]; then
cd ../binary_distrib/linux64 cd ../binary_distrib/linux64
if [ ${BUILD_TYPE} == 'Release' ]; then (echo "Stripping binary..." && strip bin/lib/linux64/libcef.so) fi if [ ${BUILD_TYPE} == 'Release' ]; then (echo "Stripping binary..." && strip bin/lib/linux64/libcef.so) fi
#Replace natives on arm64
if [ ${TARGETARCH} == 'arm64' ]; then (rm bin/gluegen-rt-natives* && rm bin/jogl-all-natives* && cp /natives/gluegen-rt-natives-linux-aarch64.jar bin && cp /natives/jogl-all-natives-linux-aarch64.jar bin) fi
else else
cd ../binary_distrib/linux32 cd ../binary_distrib/linux32
if [ ${BUILD_TYPE} == 'Release' ]; then (echo "Stripping binary..." && strip bin/lib/linux32/libcef.so) fi if [ ${BUILD_TYPE} == 'Release' ]; then (echo "Stripping binary..." && strip bin/lib/linux32/libcef.so) fi
#Replace natives on armv6
if [ ${TARGETARCH} == 'arm/v6' ]; then (rm bin/gluegen-rt-natives* && rm bin/jogl-all-natives* && cp /natives/gluegen-rt-natives-linux-armv6hf.jar bin && cp /natives/jogl-all-natives-linux-armv6hf.jar bin) fi
fi fi
tar -czvf ../../binary_distrib.tar.gz * tar -czvf ../../binary_distrib.tar.gz *