@rhq/rover 0.1.3 → 0.1.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/android/CMakeLists.txt +46 -13
- package/android/build.gradle +22 -0
- package/package.json +1 -1
package/android/CMakeLists.txt
CHANGED
|
@@ -3,11 +3,41 @@ project(roverjsi)
|
|
|
3
3
|
|
|
4
4
|
set(CMAKE_CXX_STANDARD 17)
|
|
5
5
|
|
|
6
|
-
|
|
6
|
+
# 1. Search for ReactAndroid via Prefab (modern standard for RN >= 0.71)
|
|
7
|
+
find_package(ReactAndroid CONFIG)
|
|
8
|
+
|
|
9
|
+
# 2. Setup Include Directories
|
|
10
|
+
set(ROVER_INCLUDES
|
|
7
11
|
${CMAKE_CURRENT_SOURCE_DIR}/../cpp
|
|
8
12
|
${CMAKE_CURRENT_SOURCE_DIR}/src/main/cpp
|
|
9
13
|
)
|
|
10
14
|
|
|
15
|
+
# If REACT_NATIVE_DIR is provided by Gradle, add ReactCommon and jsi headers
|
|
16
|
+
if(DEFINED REACT_NATIVE_DIR)
|
|
17
|
+
list(APPEND ROVER_INCLUDES
|
|
18
|
+
"${REACT_NATIVE_DIR}/ReactCommon"
|
|
19
|
+
"${REACT_NATIVE_DIR}/ReactCommon/jsi"
|
|
20
|
+
"${REACT_NATIVE_DIR}/ReactAndroid/src/main/jni"
|
|
21
|
+
)
|
|
22
|
+
endif()
|
|
23
|
+
|
|
24
|
+
# Fallback auto-discovery of ReactCommon if neither Prefab nor REACT_NATIVE_DIR resolved headers
|
|
25
|
+
find_path(REACT_COMMON_DIR "jsi/jsi.h"
|
|
26
|
+
PATHS
|
|
27
|
+
"${REACT_NATIVE_DIR}/ReactCommon"
|
|
28
|
+
"${CMAKE_CURRENT_SOURCE_DIR}/../../../../node_modules/react-native/ReactCommon"
|
|
29
|
+
"${CMAKE_CURRENT_SOURCE_DIR}/../../../../../node_modules/react-native/ReactCommon"
|
|
30
|
+
"${CMAKE_CURRENT_SOURCE_DIR}/../../../node_modules/react-native/ReactCommon"
|
|
31
|
+
"${CMAKE_CURRENT_SOURCE_DIR}/../../node_modules/react-native/ReactCommon"
|
|
32
|
+
)
|
|
33
|
+
|
|
34
|
+
if(REACT_COMMON_DIR)
|
|
35
|
+
list(APPEND ROVER_INCLUDES "${REACT_COMMON_DIR}")
|
|
36
|
+
list(APPEND ROVER_INCLUDES "${REACT_COMMON_DIR}/jsi")
|
|
37
|
+
endif()
|
|
38
|
+
|
|
39
|
+
include_directories(${ROVER_INCLUDES})
|
|
40
|
+
|
|
11
41
|
# Location of prebuilt librelay_rover.so compiled by cargo
|
|
12
42
|
if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/src/main/jniLibs/${ANDROID_ABI}/librelay_rover.so")
|
|
13
43
|
add_library(relay_rover SHARED IMPORTED)
|
|
@@ -24,17 +54,20 @@ add_library(roverjsi SHARED
|
|
|
24
54
|
find_library(LOG_LIB log)
|
|
25
55
|
find_library(ANDROID_LIB android)
|
|
26
56
|
|
|
57
|
+
set(ROVER_LINK_LIBS
|
|
58
|
+
${LOG_LIB}
|
|
59
|
+
${ANDROID_LIB}
|
|
60
|
+
)
|
|
61
|
+
|
|
27
62
|
if(TARGET relay_rover)
|
|
28
|
-
|
|
29
|
-
PRIVATE
|
|
30
|
-
relay_rover
|
|
31
|
-
${LOG_LIB}
|
|
32
|
-
${ANDROID_LIB}
|
|
33
|
-
)
|
|
34
|
-
else()
|
|
35
|
-
target_link_libraries(roverjsi
|
|
36
|
-
PRIVATE
|
|
37
|
-
${LOG_LIB}
|
|
38
|
-
${ANDROID_LIB}
|
|
39
|
-
)
|
|
63
|
+
list(APPEND ROVER_LINK_LIBS relay_rover)
|
|
40
64
|
endif()
|
|
65
|
+
|
|
66
|
+
if(TARGET ReactAndroid::jsi)
|
|
67
|
+
list(APPEND ROVER_LINK_LIBS ReactAndroid::jsi)
|
|
68
|
+
endif()
|
|
69
|
+
|
|
70
|
+
target_link_libraries(roverjsi
|
|
71
|
+
PRIVATE
|
|
72
|
+
${ROVER_LINK_LIBS}
|
|
73
|
+
)
|
package/android/build.gradle
CHANGED
|
@@ -5,6 +5,21 @@ def safeExtGet(prop, fallback) {
|
|
|
5
5
|
rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
|
|
6
6
|
}
|
|
7
7
|
|
|
8
|
+
def reactNativeDir = null
|
|
9
|
+
if (rootProject.ext.has("reactNativeDir")) {
|
|
10
|
+
reactNativeDir = rootProject.ext.get("reactNativeDir")
|
|
11
|
+
} else if (findProject(":ReactAndroid") != null) {
|
|
12
|
+
reactNativeDir = project(":ReactAndroid").projectDir.parentFile
|
|
13
|
+
} else {
|
|
14
|
+
def candidates = [
|
|
15
|
+
new File(projectDir, "../../../react-native"),
|
|
16
|
+
new File(projectDir, "../../../../react-native"),
|
|
17
|
+
new File(rootDir, "../node_modules/react-native"),
|
|
18
|
+
new File(rootDir, "node_modules/react-native")
|
|
19
|
+
]
|
|
20
|
+
reactNativeDir = candidates.find { it != null && it.exists() }
|
|
21
|
+
}
|
|
22
|
+
|
|
8
23
|
group = 'com.relayhq.rover'
|
|
9
24
|
version = '0.1.0'
|
|
10
25
|
|
|
@@ -27,6 +42,10 @@ android {
|
|
|
27
42
|
ndkVersion rootProject.ext.get('ndkVersion')
|
|
28
43
|
}
|
|
29
44
|
|
|
45
|
+
buildFeatures {
|
|
46
|
+
prefab true
|
|
47
|
+
}
|
|
48
|
+
|
|
30
49
|
defaultConfig {
|
|
31
50
|
minSdkVersion safeExtGet('minSdkVersion', 21)
|
|
32
51
|
targetSdkVersion safeExtGet('targetSdkVersion', 34)
|
|
@@ -41,6 +60,9 @@ android {
|
|
|
41
60
|
cmake {
|
|
42
61
|
cppFlags "-std=c++17 -O3"
|
|
43
62
|
arguments "-DANDROID_STL=c++_shared"
|
|
63
|
+
if (reactNativeDir != null) {
|
|
64
|
+
arguments "-DREACT_NATIVE_DIR=${reactNativeDir.canonicalPath}"
|
|
65
|
+
}
|
|
44
66
|
}
|
|
45
67
|
}
|
|
46
68
|
}
|
package/package.json
CHANGED