Revert "Move shared bridge C sources to src/native_bridge/ (consolidation step 1)"

This reverts commit fb60a8c.

Author: FeodorFitsner

.github/workflows/ci.yml

@@ -535,9 +535,9 @@ jobs:
           $CC -shared -fPIC -fvisibility=hidden \
             -DPy_LIMITED_API=0x030c0000 \
             -I"$INCLUDE_DIR" \
-            -I"src/native_bridge" \
-            src/native_bridge/dart_bridge.c \
-            src/native_bridge/dart_api/dart_api_dl.c \
+            -I"src/serious_python_bridge/native" \
+            src/serious_python_bridge/native/dart_bridge.c \
+            src/serious_python_bridge/native/dart_api/dart_api_dl.c \
             "$LIBPYTHON" \
             -Wl,-z,max-page-size=16384 \
             -o "$OUT"

.github/workflows/test-bridge-build.yml

@@ -63,7 +63,7 @@ jobs:
           $vcvars = "$vsPath\VC\Auxiliary\Build\vcvars64.bat"
           Write-Host "vcvars: $vcvars"
 
-          $shimSrc = (Resolve-Path 'src/native_bridge/dart_bridge_shim.c').Path
+          $shimSrc = (Resolve-Path 'src/serious_python_bridge/native/dart_bridge_shim.c').Path
           $includeDir = (Resolve-Path "pywin-$pyver/include").Path
           $libDir = (Resolve-Path "pywin-$pyver/libs").Path
           $outDir = "$PWD\debug_build"
@@ -222,8 +222,8 @@ jobs:
           $CC -shared -fPIC -fvisibility=hidden \
             -DPy_LIMITED_API=0x030c0000 \
             -I"$INCLUDE_DIR" \
-            -I"src/native_bridge" \
-            src/native_bridge/dart_bridge_shim.c \
+            -I"src/serious_python_bridge/native" \
+            src/serious_python_bridge/native/dart_bridge_shim.c \
             "$LIBPYTHON" \
             -ldl \
             -Wl,-z,max-page-size=16384 \

src/serious_python_bridge/android/CMakeLists.txt

@@ -18,7 +18,7 @@ set(PYTHON_ABI_DIR "${PYTHON_DIST_DIR}/${ANDROID_ABI}")
 set(FLET_BRIDGE_PYTHON_INCLUDE_DIRS "${PYTHON_ABI_DIR}/include/python${PYTHON_VERSION}")
 set(FLET_BRIDGE_PYTHON_LIBRARIES "${PYTHON_ABI_DIR}/lib/libpython3.so")
 
-add_subdirectory("../../native_bridge" "${CMAKE_CURRENT_BINARY_DIR}/shared")
+add_subdirectory("../native" "${CMAKE_CURRENT_BINARY_DIR}/shared")
 
 # Android 15: 16 KB page size support.
 set_target_properties(flet_bridge PROPERTIES

src/serious_python_bridge/darwin/Classes/dart_api/dart_api.h

@@ -1 +1 @@
-../../../../native_bridge/dart_api/dart_api.h
+../../../native/dart_api/dart_api.h

src/serious_python_bridge/darwin/Classes/dart_api/dart_api_dl.c

@@ -1 +1 @@
-../../../../native_bridge/dart_api/dart_api_dl.c
+../../../native/dart_api/dart_api_dl.c

src/serious_python_bridge/darwin/Classes/dart_api/dart_api_dl.h

@@ -1 +1 @@
-../../../../native_bridge/dart_api/dart_api_dl.h
+../../../native/dart_api/dart_api_dl.h

src/serious_python_bridge/darwin/Classes/dart_api/dart_native_api.h

@@ -1 +1 @@
-../../../../native_bridge/dart_api/dart_native_api.h
+../../../native/dart_api/dart_native_api.h

src/serious_python_bridge/darwin/Classes/dart_api/dart_tools_api.h

@@ -1 +1 @@
-../../../../native_bridge/dart_api/dart_tools_api.h
+../../../native/dart_api/dart_tools_api.h

src/serious_python_bridge/darwin/Classes/dart_api/dart_version.h

@@ -1 +1 @@
-../../../../native_bridge/dart_api/dart_version.h
+../../../native/dart_api/dart_version.h

src/serious_python_bridge/darwin/Classes/dart_bridge.c

@@ -1 +1 @@
-../../../native_bridge/dart_bridge.c
+../../native/dart_bridge.c