zdoom/fluidsynth
0
0
Fork 0
mirror of https://github.com/ZDoom/fluidsynth.git synced 2025-06-01 17:42:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update Android CircleCI build to use latest orb, Android API, Oboe and Cerbero (#690)

Browse source 
This fixes the currently-broken CircleCI build for Android-useable .so files.

Currently the Cerbero build is based off https://github.com/falrm/cerbero until https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/641 is merged and deployed to the GitHub cerbero mirror.

Here is a successful build with the updated CircleCI workflow: 0ad3186a-394c-4736-984b-96496b608053/jobs/32

Fixes #688
This commit is contained in:
Jon Latané 2020-10-20 11:09:11 -04:00 • committed by GitHub
parent 3efaaffba5
commit 21653bd08b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

8
doc/android/Makefile.android
View file

@ -17,7 +17,7 @@ CERBERO=$(PWD)/external/cerbero
OBOE=$(PWD)/external/oboe
CMAKE=cmake
ANDROID_NDK = $(PWD)/external/cerbero/build/android-ndk-18
ANDROID_NDK = $(PWD)/external/cerbero/build/android-ndk-21
ABIS_SIMPLE = x86 x86-64 armv7 arm64
@ -35,17 +35,17 @@ prepare: checkout-oboe checkout-cerbero
.PHONY: checkout-oboe
checkout-oboe: $(OBOE)
cd $(OBOE) && git checkout 9bf3943
cd $(OBOE) && git checkout 395f3d6ac25c2b069d53451b89dff4aa96d26eb8
$(OBOE):
git clone https://github.com/Google/oboe.git $(OBOE)
.PHONY: checkout-cerbero
checkout-cerbero: $(CERBERO)
cd $(CERBERO) && git checkout 0acd9b0
cd $(CERBERO) && git checkout e9f18b3b340de1648d885a0542d2f06c3fcfffe8
$(CERBERO):
git clone https://github.com/atsushieno/cerbero.git $(CERBERO)
git clone https://github.com/falrm/cerbero.git $(CERBERO)
.PHONY: build
build: build-oboe dist-oboe build-deps-cerbero dist-deps-cerbero build-fluidsynth dist-fluidsynth build-fluidsynth-assetloader dist-fluidsynth-assetloader