Use addon prebuilds

holepunchto · Aug 28, 2024 · 98348d4 · 98348d4
1 parent 8532a2e
commit 98348d4
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 18 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -39,4 +39,4 @@ jobs:
         java-version: 21
     - run: npm install -g bare-dev
     - run: bare-dev android sdk licenses accept
-    - run: bare-dev build
+    - run: bare-dev build --gradle
diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,7 @@
 .cxx/
 .idea/
 build/
+prebuilds/
 node_modules/
 package-lock.json
 local.properties

diff --git a/app/CMakeLists.txt → CMakeLists.txt b/app/CMakeLists.txt → CMakeLists.txt
@@ -4,34 +4,41 @@ project(bare_android C)
 
 include(bare)
 
-set(BARE_USE_SYSTEM_LOG ON CACHE BOOL "Use system logging" FORCE)
-
-install_node_modules(WORKING_DIRECTORY ..)
-
-add_subdirectory(../vendor/bare-kit vendor/bare-kit EXCLUDE_FROM_ALL)
+install_node_modules()
 
 add_bare_bundle(
   bare_android_bundle
   ENTRY app/src/main/js/app.js
   OUT app/src/main/assets/app.bundle
-  WORKING_DIRECTORY ..
 )
 
 add_library(bare_android SHARED)
 
+add_dependencies(bare_android bare_android_bundle)
+
 set_target_properties(
   bare_android
   PROPERTIES
-  C_STANDARD 99
-  POSITION_INDEPENDENT_CODE ON
+  LINKER_LANGUAGE C
+  OUTPUT_NAME app
 )
 
-add_dependencies(bare_android bare_android_bundle)
+target_sources(
+  bare_android
+  PUBLIC
+    app/src/main/assets/app.bundle
+)
+
+link_bare_modules(
+  bare_android
+  PREBUILDS
+  DESTINATION app/src/main/jniLibs/${ANDROID_ABI}
+)
+
+find_package(bare-kit REQUIRED CONFIG)
 
 target_link_libraries(
   bare_android
   PUBLIC
-    bare_kit
+    bare-kit::bare_kit
 )
-
-link_bare_modules(bare_android WORKING_DIRECTORY ..)
diff --git a/app/build.gradle b/app/build.gradle
@@ -5,7 +5,7 @@ plugins {
 android {
   namespace 'to.holepunch.bare.android'
   compileSdk 34
-  ndkVersion '27.0.11718014'
+  ndkVersion '27.0.12077973'
 
   defaultConfig {
     applicationId 'to.holepunch.bare.android'
@@ -17,11 +17,15 @@ android {
     externalNativeBuild {
       cmake {
         targets 'bare_android'
-        arguments "-DCMAKE_MODULE_PATH=$System.env.CMAKE_MODULE_PATH"
+        arguments "-DCMAKE_MODULE_PATH=" + "bare-dev paths cmake".execute().text, "-DANDROID_STL=none"
       }
     }
   }
 
+  buildFeatures {
+    prefab true
+  }
+
   buildTypes {
     release {
       signingConfig signingConfigs.debug
@@ -31,7 +35,7 @@ android {
   externalNativeBuild {
     cmake {
       version '3.25.0+'
-      path 'CMakeLists.txt'
+      path '../CMakeLists.txt'
     }
   }
 }

diff --git a/app/src/main/java/to/holepunch/bare/android/MainActivity.java b/app/src/main/java/to/holepunch/bare/android/MainActivity.java
@@ -9,7 +9,7 @@
 
 public class MainActivity extends Activity {
   static {
-    System.loadLibrary("bare_android");
+    System.loadLibrary("app");
   }
 
   Worklet worklet;

diff --git a/app/src/main/jniLibs/.gitignore b/app/src/main/jniLibs/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
diff --git a/vendor/bare-kit b/vendor/bare-kit
+77 −0		.github/workflows/prebuild.yml
+19 −6		.github/workflows/test.yml
+2 −0		CMakeLists.txt
+0 −1		android/.gitignore
+1 −1		android/CMakeLists.txt
+25 −1		android/build.gradle
+4 −0		android/src/main/java/to/holepunch/bare/kit/Worklet.java
+1 −1		apple/CMakeLists.txt
+1 −1		vendor/bare