railbird/react-native-vision-camera
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: Remove RN Skia dependency on Android for now

Browse Source
This commit is contained in:
Marc Rousavy 2023-02-23 17:43:24 +01:00
parent f227a3e396
commit 61f19df500
2 changed files with 1 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
android/CMakeLists.txt
View File

@ -17,11 +17,6 @@ find_package(fbjni REQUIRED CONFIG)
find_package(react-native-worklets REQUIRED CONFIG) find_package(react-native-worklets REQUIRED CONFIG)
find_library(LOG_LIB log) find_library(LOG_LIB log)
# Skia is optional, if it's enabled we link it.
if (ENABLE_SKIA_INTEGRATION)
find_package(shopify_react-native-skia REQUIRED CONFIG)
endif()
# Add react-native-vision-camera sources # Add react-native-vision-camera sources
add_library( add_library(
${PACKAGE_NAME} ${PACKAGE_NAME}
@ -60,11 +55,3 @@ target_link_libraries(
fbjni::fbjni # <-- fbjni fbjni::fbjni # <-- fbjni
react-native-worklets::rnworklets # <-- RN Worklets react-native-worklets::rnworklets # <-- RN Worklets
) )
# Skia is optional. If it's enabled, we link it
if (ENABLE_SKIA_INTEGRATION)
target_link_libraries(
${PACKAGE_NAME}
shopify_react-native-skia::rnskia # <-- RN Skia
)
endif()

9
android/build.gradle
View File

@ -66,8 +66,6 @@ static def findNodeModules(baseDir) {
} }
def nodeModules = findNodeModules(projectDir) def nodeModules = findNodeModules(projectDir)
def isSkiaInstalled = findProject(":shopify_react-native-skia") != null
logger.warn("react-native-vision-camera: Skia integration is ${isSkiaInstalled ? "enabled" : "disabled"}!")
repositories { repositories {
google() google()
@ -101,8 +99,7 @@ android {
cmake { cmake {
cppFlags "-O2 -frtti -fexceptions -Wall -Wno-unused-variable -fstack-protector-all" cppFlags "-O2 -frtti -fexceptions -Wall -Wno-unused-variable -fstack-protector-all"
arguments "-DANDROID_STL=c++_shared", arguments "-DANDROID_STL=c++_shared",
"-DNODE_MODULES_DIR=${nodeModules}", "-DNODE_MODULES_DIR=${nodeModules}"
"-DENABLE_SKIA_INTEGRATION=${isSkiaInstalled}"
abiFilters (*reactNativeArchitectures()) abiFilters (*reactNativeArchitectures())
} }
} }
@ -160,10 +157,6 @@ dependencies {
implementation "androidx.exifinterface:exifinterface:1.3.3" implementation "androidx.exifinterface:exifinterface:1.3.3"
implementation project(":react-native-worklets") implementation project(":react-native-worklets")
if (isSkiaInstalled) {
implementation project(":shopify_react-native-skia")
}
} }
// Resolves "LOCAL_SRC_FILES points to a missing file, Check that libfb.so exists or that its path is correct". // Resolves "LOCAL_SRC_FILES points to a missing file, Check that libfb.so exists or that its path is correct".