Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix create release workflow not copying Android libraries #76

Merged
merged 2 commits into from
Jun 13, 2024
Merged

Fix create release workflow not copying Android libraries #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c94cf18
Fix clean Android templates not deleting app/libs directory
madmiraal Jun 13, 2024
0d43caa
Fix create release not copying Android libraries
madmiraal Jun 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions .github/workflows/create-release.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,7 @@ jobs:
# Copy Android libraries to project's jniLibs folders
# For each library identify the correct build and architecture folder.
project_src_dir=platform/android/project/engine/src
stl_lib_src_dir=$ANDROID_NDK_ROOT/sources/cxx-stl/llvm-libc++/libs
for library in `ls -1 bin/librebel.android.*`; do
case $library in
*debug* )
Expand All @@ -302,12 +303,14 @@ jobs:
# Copy $arch_id $build Rebel Engine library into $build jniLibs $arch folder
target=$project_src_dir/$build/jniLibs/$arch
mkdir -p $target
echo "Copying $library into $target
echo "Copying $library into $target"
cp $library $target
# Copy $arch_id stl_lib into jniLibs $arch folder
stl_lib=$ANDROID_NDK_ROOT/sources/cxx-stl/llvm-libc++/libs/$arch/libc++_shared.so
stl_lib=$stl_lib_src_dir/$arch/libc++_shared.so
target=$project_src_dir/main/jniLibs/$arch
mkdir -p $target
echo "Copying $stl_lib into $target
echo "Copying $stl_lib into $target"
cp $stl_lib $target
done

- name: Create Android Templates
Expand Down
1 change: 1 addition & 0 deletions platform/android/project/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ tasks.register('createDevelopmentAndroidTemplates') {
tasks.register('cleanAndroidTemplates', Delete) {
group "Rebel"
description "Cleans and deletes all the Rebel Engine Android libraries and templates."
delete "app/libs"
delete "app/src/debug"
delete "app/src/release"
delete "engine/src/main/jniLibs"
Expand Down