ffi: convert to using gomobile

Signed-off-by: Sumner Evans <sumner@beeper.com>
beeper · Jan 2, 2024 · d3b1d94 · d3b1d94
1 parent 9cd79ba
commit d3b1d94
Show file tree

Hide file tree

Showing 27 changed files with 41 additions and 578 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -22,22 +22,23 @@ jobs:
       uses: actions/setup-go@v4
       with:
         go-version: '1.21.1'
+    - name: Install gomobile
+      run: |
+        go install golang.org/x/mobile/cmd/gomobile@latest
     - name: Set up JDK 17
       uses: actions/setup-java@v3
       with:
         distribution: 'temurin'
         java-version: '17'
         cache: 'gradle'
-    - name: Build imessage.so
-      run: ./android/imessage.sh
     - name: Build AAR
-      run: ./android/gradlew -p android :library:assembleRelease
-    - name: Publish to GitHub Packages
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      run: ./android/gradlew -p android :library:publish
+      run: gomobile bind -target=android -androidapi 26 -o imessage.aar ./imessage/ffi
+    # - name: Publish to GitHub Packages
+    #   env:
+    #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    #   run: ./android/gradlew -p android :library:publish
     - name: Upload artifacts
       uses: actions/upload-artifact@v3
       with:
         name: aar
-        path: ./android/library/build/outputs/aar/library-release.aar
+        path: ffi.aar
diff --git a/.gitignore b/.gitignore
@@ -19,3 +19,6 @@
 /.android-ipc-bin
 /imgo.h
 /imgo.so
+
+/imessage-sources.jar
+/imessage.aar
diff --git a/android/.gitignore b/android/.gitignore
diff --git a/android/build.gradle.kts b/android/build.gradle.kts
diff --git a/android/gradle.properties b/android/gradle.properties
diff --git a/android/gradle/wrapper/gradle-wrapper.jar b/android/gradle/wrapper/gradle-wrapper.jar
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
diff --git a/android/gradlew b/android/gradlew
diff --git a/android/gradlew.bat b/android/gradlew.bat