android fixes

BabylonJS · Sep 7, 2023 · ececebc · ececebc
1 parent bb75d07
commit ececebc
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 20 deletions.
diff --git a/.github/workflows/publish_preview.yml b/.github/workflows/publish_preview.yml
@@ -118,26 +118,26 @@ jobs:
         with:
           name: 'Assembled-iOSAndroid0.71'
           path: Package/Assembled-iOSAndroid0.71
-      - name: Download Assembled-Windows 0.64 Folder
-        uses: actions/download-artifact@v2
-        with:
-          name: 'Assembled-Windows0.64'
-          path: Package/Assembled-Windows0.64
-      - name: Download Assembled-Windows 0.65 Folder
-        uses: actions/download-artifact@v2
-        with:
-          name: 'Assembled-Windows0.65'
-          path: Package/Assembled-Windows0.65
-      - name: Download Assembled-Windows 0.69 Folder
-        uses: actions/download-artifact@v2
-        with:
-          name: 'Assembled-Windows0.69'
-          path: Package/Assembled-Windows0.69
-      - name: Download Assembled-Windows 0.70 Folder
-        uses: actions/download-artifact@v2
-        with:
-          name: 'Assembled-Windows0.70'
-          path: Package/Assembled-Windows0.70
+#      - name: Download Assembled-Windows 0.64 Folder
+#        uses: actions/download-artifact@v2
+#        with:
+#          name: 'Assembled-Windows0.64'
+#          path: Package/Assembled-Windows0.64
+#      - name: Download Assembled-Windows 0.65 Folder
+#        uses: actions/download-artifact@v2
+#        with:
+#          name: 'Assembled-Windows0.65'
+#          path: Package/Assembled-Windows0.65
+#      - name: Download Assembled-Windows 0.69 Folder
+#        uses: actions/download-artifact@v2
+#        with:
+#          name: 'Assembled-Windows0.69'
+#          path: Package/Assembled-Windows0.69
+#      - name: Download Assembled-Windows 0.70 Folder
+#        uses: actions/download-artifact@v2
+#        with:
+#          name: 'Assembled-Windows0.70'
+#          path: Package/Assembled-Windows0.70
       - name: Download Assembled-Windows 0.71 Folder
         uses: actions/download-artifact@v2
         with:

diff --git a/Modules/@babylonjs/react-native-iosandroid/android/build.gradle b/Modules/@babylonjs/react-native-iosandroid/android/build.gradle
@@ -35,6 +35,10 @@ if ( propertiesFile.isFile() ) {
 
 def cpp_distribution = (REACT_VERSION >= 71) ? "c++_shared" : "c++_static";
 
+def BASEKIT_BUILD
+if (project.hasProperty("BASEKIT_BUILD")) {
+    BASEKIT_BUILD = project.getProperty("BASEKIT_BUILD")
+
 if (REACT_VERSION >= 71) {
     DEFAULT_NDK_VERSION = '23.1.7779620'
 }