Skip to content

Commit acdd8a2

Browse files
committed
github-action / workaround for android/yocto
- Android CI build's prebuilt binaries have incorrect rpaths. Add a symlink to workaround - Yocto build requires meta-neural-network. Disable it until the script is ready. Signed-off-by: MyungJoo Ham <[email protected]>
1 parent 5470912 commit acdd8a2

File tree

2 files changed

+13
-4
lines changed

2 files changed

+13
-4
lines changed

.github/workflows/android.yml

+10-1
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,17 @@ jobs:
7979
ls -la ./libs/arm64-v8a/
8080
cp ./libs/arm64-v8a/libnnstreamer.so $GSTREAMER_ROOT_ANDROID/arm64/lib/gstreamer-1.0/
8181
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:./libs/arm64-v8a
82+
83+
# Workaround for the gstreamer-android prebuild binary build glitches
84+
result=$(readelf -d $ORGP/android/gst_root_android/arm64/lib/libfontconfig.so | grep "/data/nnstreamer/cerbero.custom-1.12.4-ndkr12b-20190213-0900/build/dist/android_arm64/lib")
85+
if [[ ! -z $result ]]; then
86+
echo "Warning: the given prebuilt binaries for Android have incorrect rpaths."
87+
sudo mkdir -p /data/nnstreamer/cerbero.custom-1.12.4-ndkr12b-20190213-0900/build/dist/android_arm64/
88+
sudo ln -s $ORGP/android/gst_root_android/arm64/lib /data/nnstreamer/cerbero.custom-1.12.4-ndkr12b-20190213-0900/build/dist/android_arm64/lib
89+
fi
90+
8291
echo "::group::Build a test application"
83-
LDFLAGS+="-L~/android/gst_root_android/arm64/lib" ndk-build NDK_PROJECT_PATH=. APP_BUILD_SCRIPT=./Android-app.mk NDK_APPLICATION_MK=./Application.mk -j$(nproc)
92+
ndk-build NDK_PROJECT_PATH=. APP_BUILD_SCRIPT=./Android-app.mk NDK_APPLICATION_MK=./Application.mk -j$(nproc)
8493
ls -la /data/nnstreamer/cerbero.custom-1.12.4-ndkr12b-20190213-0900/build/dist/android_arm64/lib/
8594
echo "::endgroup::"
8695
cd ..

.github/workflows/yocto.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
name: Yocto build
1+
name: Yocto build (disabled)
22

33
on:
4-
pull_request:
5-
branches: [ main ]
4+
# pull_request:
5+
# branches: [ main ]
66

77
jobs:
88
build:

0 commit comments

Comments
 (0)