Merge branch 'moonlight_submodule_removal' into 'master'
Moonlight: fix build of 8.2 (199) See merge request fdroid/fdroiddata!5305
This commit is contained in:
commit
f6e7e346e1
|
@ -258,14 +258,14 @@ Builds:
|
||||||
- OpenSSL@OpenSSL_1_1_1c
|
- OpenSSL@OpenSSL_1_1_1c
|
||||||
- opus@v1.3
|
- opus@v1.3
|
||||||
rm:
|
rm:
|
||||||
- moonlight-common/src/main/jni/moonlight-core/openssl/include
|
- app/src/main/jni/moonlight-core/openssl/include
|
||||||
- moonlight-common/src/main/jni/moonlight-core/libopus/include
|
- app/src/main/jni/moonlight-core/libopus/include
|
||||||
prebuild: sed -i 's/applicationIdSuffix/\/\/applicationIdSuffix/g' build.gradle
|
prebuild: sed -i 's/applicationIdSuffix/\/\/applicationIdSuffix/g' build.gradle
|
||||||
scandelete:
|
scandelete:
|
||||||
- moonlight-common/src/main/jni/moonlight-core/openssl
|
- app/src/main/jni/moonlight-core/openssl
|
||||||
- moonlight-common/src/main/jni/moonlight-core/libopus
|
- app/src/main/jni/moonlight-core/libopus
|
||||||
build:
|
build:
|
||||||
- lib="$PWD/../moonlight-common/src/main/jni/moonlight-core"
|
- lib="$PWD/src/main/jni/moonlight-core"
|
||||||
- PATH=$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin:$PATH
|
- PATH=$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin:$PATH
|
||||||
- pushd $$opus$$
|
- pushd $$opus$$
|
||||||
- ./autogen.sh
|
- ./autogen.sh
|
||||||
|
@ -322,7 +322,7 @@ Builds:
|
||||||
- cp -R include/ ${lib}/openssl/
|
- cp -R include/ ${lib}/openssl/
|
||||||
- make distclean
|
- make distclean
|
||||||
- popd
|
- popd
|
||||||
ndk: r19c
|
ndk: r20
|
||||||
|
|
||||||
AutoUpdateMode: Version v%v
|
AutoUpdateMode: Version v%v
|
||||||
UpdateCheckMode: Tags v\d+\.\d+(\.\d+)?
|
UpdateCheckMode: Tags v\d+\.\d+(\.\d+)?
|
||||||
|
|
Loading…
Reference in a new issue