feat: fix cmake paths

jpudysz · Dec 4, 2023 · 8e61a1e · 8e61a1e
1 parent 6476dd1
commit 8e61a1e
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 4 deletions.
diff --git a/android/CMakeLists.txt b/android/CMakeLists.txt
@@ -6,14 +6,10 @@ add_library(unistyles
     SHARED
     ../cxx/UnistylesRuntime.cpp
     ./src/main/cxx/cpp-adapter.cpp
-    ../node_modules/react-native/ReactCommon/jsi/jsi/jsi.cpp
 )
 
 include_directories(
     ../cxx
-    ../node_modules/react-native/React
-    ../node_modules/react-native/React/Base
-    ../node_modules/react-native/ReactCommon/jsi
 )
 
 set_target_properties(unistyles PROPERTIES
@@ -23,6 +19,9 @@ set_target_properties(unistyles PROPERTIES
     POSITION_INDEPENDENT_CODE ON
 )
 
+find_package(ReactAndroid REQUIRED CONFIG)
+
 target_link_libraries(unistyles
+    ReactAndroid::jsi
     android
 )
diff --git a/android/build.gradle b/android/build.gradle
@@ -15,19 +15,45 @@ buildscript {
 apply plugin: 'com.android.library'
 apply plugin: 'org.jetbrains.kotlin.android'
 
+def resolveBuildType() {
+    Gradle gradle = getGradle()
+    String tskReqStr = gradle.getStartParameter().getTaskRequests()['args'].toString()
+
+    return tskReqStr.contains('Release') ? 'release' : 'debug'
+}
+
 android {
     compileSdkVersion safeExtGet('compileSdkVersion', 33)
     namespace "com.unistyles"
 
     defaultConfig {
         minSdkVersion safeExtGet('minSdkVersion', 21)
+        externalNativeBuild {
+            cmake {
+                arguments "-DANDROID_STL=c++_shared"
+            }
+        }
+    }
+
+    buildFeatures {
+        prefab true
     }
 
     externalNativeBuild {
         cmake {
             path "CMakeLists.txt"
         }
     }
+
+    packagingOptions {
+        doNotStrip resolveBuildType() == 'debug' ? "**/**/*.so" : ''
+        excludes = [
+            "META-INF",
+            "META-INF/**",
+            "**/libjsi.so",
+            "**/libc++_shared.so"
+        ]
+    }
 }
 
 repositories {