android build

Author: CedricGuillemet

Modules/@babylonjs/react-native/android/CMakeLists.txt

@@ -190,7 +190,6 @@ if (EXISTS "${TURBOMODULE_DIR}/CMakeLists.txt")
     endif()
 
     target_include_directories(BabylonNative PRIVATE ${SHARED_INCLUDES})
-
 else()
     # <= React Native 0.70
     # Define a minimal version of libturbomodulejsijni.so that includes CallInvokerHolder.cpp.

Modules/@babylonjs/react-native/android/build.gradle

@@ -36,7 +36,7 @@ if ( propertiesFile.isFile() ) {
 
 def cpp_distribution = (REACT_VERSION >= 71) ? "c++_shared" : "c++_static";
 
-def basekitBuild = 0
+def basekitBuild = "ON"
 if (project.hasProperty("BASEKIT_BUILD")) {
     basekitBuild = project.getProperty("BASEKIT_BUILD")
 }
@@ -96,7 +96,9 @@ android {
                         "-DFETCHCONTENT_SOURCE_DIR_URLLIB=../shared/BabylonNative/deps/urllib-src",
                         "-DFETCHCONTENT_SOURCE_DIR_SPIRV-CROSS=../shared/BabylonNative/deps/spirv-cross-src",
                         "-DFETCHCONTENT_SOURCE_DIR_LIBWEBP=../shared/BabylonNative/deps/libwebp-src",
-                        "-DFETCHCONTENT_SOURCE_DIR_GLSLANG=../shared/BabylonNative/deps/glslang-src"
+                        "-DFETCHCONTENT_SOURCE_DIR_GLSLANG=../shared/BabylonNative/deps/glslang-src",
+                        "-DFETCHCONTENT_SOURCE_DIR_BASE-N=../shared/BabylonNative/deps/base-n-src",
+                        "-DFETCHCONTENT_SOURCE_DIR_ANDROIDEXTENSIONS=../shared/BabylonNative/deps/androidextensions-src"
             }
         }
         ndk {

Modules/@babylonjs/react-native/shared/CMakeLists.txt

@@ -1,16 +1,17 @@
 include(FetchContent)
 
+if (${BASEKIT_BUILD})
+    set(BABYLON_NATIVE_PLUGIN_NATIVEXR OFF CACHE BOOL "")
+    set(BABYLON_NATIVE_PLUGIN_NATIVECAMERA OFF CACHE BOOL "")
+endif()
+
 add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/BabylonNative)
 
 set(SHARED_INCLUDES
-    "${CMAKE_CURRENT_LIST_DIR}")
+    "${CMAKE_CURRENT_LIST_DIR}" PARENT_SCOPE)
 
 set(SHARED_SOURCES
     "${CMAKE_CURRENT_LIST_DIR}/DispatchFunction.h"
     "${CMAKE_CURRENT_LIST_DIR}/BabylonNative.h"
-    "${CMAKE_CURRENT_LIST_DIR}/BabylonNative.cpp")
+    "${CMAKE_CURRENT_LIST_DIR}/BabylonNative.cpp" PARENT_SCOPE)
 
-if (${BASEKIT_BUILD})
-    set(BABYLON_NATIVE_PLUGIN_NATIVEXR OFF CACHE BOOL "")
-    set(BABYLON_NATIVE_PLUGIN_NATIVECAMERA OFF CACHE BOOL "")
-endif()

Package/gulpfile.js

@@ -680,8 +680,10 @@ const patchPackageVersion = async () => {
 }
 
 
-const COMMIT_ID = '7f82d72f22e9789b9b66cb837aec0c9bc8ff65ee';
-const ZIP_URL = `https://github.com/BabylonJS/BabylonNative/archive/${COMMIT_ID}.zip`;
+//const COMMIT_ID = '7f82d72f22e9789b9b66cb837aec0c9bc8ff65ee';
+//const ZIP_URL = `https://github.com/BabylonJS/BabylonNative/archive/${COMMIT_ID}.zip`;
+const COMMIT_ID = '21911774d516e677e99baecbee6054de9429f4b6';
+const ZIP_URL = `https://github.com/CedricGuillemet/BabylonNative/archive/${COMMIT_ID}.zip`;
 const TARGET_DIR = path.resolve(__dirname, '../Modules/@babylonjs/react-native/shared/BabylonNative');
 const ZIP_PATH = path.join(TARGET_DIR, `${COMMIT_ID}.zip`);
 const UNZIP_FOLDER = path.join(TARGET_DIR, `BabylonNative-${COMMIT_ID}`);
@@ -726,7 +728,7 @@ function deleteFile(filePath) {
 }
 
 function runCMake(buildDir) {
-  let cmakeCommand = `cmake -S . -B ../tempBuild`;
+  let cmakeCommand = `cmake -S . -B ../tempBuild -DBABYLON_NATIVE_BUILD_SOURCETREE=ON`;
 
   exec(cmakeCommand, buildDir);
 }