Skip to content

Remove Android tooling that was used for prototyping #76

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

Merged
merged 2 commits into from
May 3, 2024
Merged

Remove Android tooling that was used for prototyping #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
fc0cd85
Remove unused Dockerfile
oguzkocer May 3, 2024
d15fbf0
Remove Android related Make tests
oguzkocer May 3, 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
44 changes: 0 additions & 44 deletions Dockerfile
View file
Open in desktop

This file was deleted.

30 changes: 1 addition & 29 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
android_project_root := ./native/android
android_generated_source_path := $(android_project_root)/lib/build/generated/source
jni_libs_root := $(android_project_root)/lib/src/main/jniLibs

# The directory where the git repo is mounted in the docker container
docker_container_repo_dir=/app

Expand Down Expand Up @@ -33,24 +29,11 @@ endif
clean:
git clean -ffXd

_generate-jni-libs:
rm -rf $(jni_libs_root)
cargo build --release --lib --target x86_64-linux-android --target i686-linux-android --target armv7-linux-androideabi --target aarch64-linux-android
mkdir -p $(jni_libs_root)/arm64-v8a
mkdir -p $(jni_libs_root)/armeabi-v7a
mkdir -p $(jni_libs_root)/x86
mkdir -p $(jni_libs_root)/x86_64
cp ./target/aarch64-linux-android/release/libwp_api.so $(jni_libs_root)/arm64-v8a/libuniffi_wp_api.so
cp ./target/armv7-linux-androideabi/release/libwp_api.so $(jni_libs_root)/armeabi-v7a/libuniffi_wp_api.so
cp ./target/i686-linux-android/release/libwp_api.so $(jni_libs_root)/x86/libuniffi_wp_api.so
cp ./target/x86_64-linux-android/release/libwp_api.so $(jni_libs_root)/x86_64/libuniffi_wp_api.so

bindings:
rm -rf $(android_generated_source_path) target/swift-bindings
rm -rf target/swift-bindings
cargo build --release

#wp_api
cargo run --release --bin wp_uniffi_bindgen generate --library ./target/release/libwp_api.$(dylib_ext) --out-dir $(android_generated_source_path) --language kotlin
cargo run --release --bin wp_uniffi_bindgen generate --library ./target/release/libwp_api.$(dylib_ext) --out-dir ./target/swift-bindings --language swift
cp target/swift-bindings/wp_api.swift native/swift/Sources/wordpress-api-wrapper/wp_api.swift

Expand All @@ -67,13 +50,6 @@ docs:
docs-archive: docs
tar -czvf docs.tar.gz docs

_test-android:
./native/android/gradlew -p ./native/android cAT

_publish-android-local:
./native/android/gradlew -p ./native/android publishToMavenLocal -exclude-task prepareToPublishToS3


# Builds the library for all the various architectures / systems required in an XCFramework
xcframework-libraries:
# macOS
Expand Down Expand Up @@ -203,10 +179,6 @@ test-swift-tvOS: xcframework
test-swift-watchOS: xcframework
scripts/xcodebuild-test.sh watchOS-10-4

test-android: bindings _test-android

publish-android-local: bindings _publish-android-local

test-rust-lib:
$(rust_docker_run) cargo test --lib -- --nocapture

Expand Down