π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
[mobile] Centralize vendored cargokit
laurenspriem1250bd4453a3
diff --git a/mobile/apps/photos/rust_builder/android/build.gradle b/mobile/apps/photos/rust_builder/android/build.gradleindex dd84cc2ea9..b7083bacd3 100644--- a/mobile/apps/photos/rust_builder/android/build.gradle+++ b/mobile/apps/photos/rust_builder/android/build.gradle@@ -43,7 +43,7 @@ android {}}-apply from: "../cargokit/gradle/plugin.gradle"+apply from: "../../../../cargokit/gradle/plugin.gradle"cargokit {manifestDir = "../../../../../rust/bindings/frb/photos"libname = "ente_photos_rust"diff --git a/mobile/apps/photos/rust_builder/cargokit/.gitignore b/mobile/apps/photos/rust_builder/cargokit/.gitignoredeleted file mode 100644index 2f7896d1d1..0000000000--- a/mobile/apps/photos/rust_builder/cargokit/.gitignore+++ /dev/null@@ -1 +0,0 @@-target/diff --git a/mobile/apps/photos/rust_builder/ios/ente_photos_rust.podspec b/mobile/apps/photos/rust_builder/ios/ente_photos_rust.podspecindex a12db0ac29..c8774c088d 100644--- a/mobile/apps/photos/rust_builder/ios/ente_photos_rust.podspec+++ b/mobile/apps/photos/rust_builder/ios/ente_photos_rust.podspec@@ -43,7 +43,7 @@ A new Flutter FFI plugin project.exit 1fiunset ORT_IOS_XCFWK_PATH ORT_IOS_XCFWK_LOCATION- sh "$PODS_TARGET_SRCROOT/../cargokit/build_pod.sh" ../../../../../rust/bindings/frb/photos ente_photos_rust+ sh "$(cd -P "$PODS_TARGET_SRCROOT" && pwd)/../../../../cargokit/build_pod.sh" ../../../../../rust/bindings/frb/photos ente_photos_rustSCRIPT:execution_position => :before_compile,:input_files => ['${BUILT_PRODUCTS_DIR}/cargokit_phony'],diff --git a/mobile/apps/photos/rust_builder/linux/CMakeLists.txt b/mobile/apps/photos/rust_builder/linux/CMakeLists.txtindex 09d023fd13..ce191daf72 100644--- a/mobile/apps/photos/rust_builder/linux/CMakeLists.txt+++ b/mobile/apps/photos/rust_builder/linux/CMakeLists.txt@@ -7,7 +7,7 @@ cmake_minimum_required(VERSION 3.10)set(PROJECT_NAME "ente_photos_rust")project(${PROJECT_NAME} LANGUAGES CXX)-include("../cargokit/cmake/cargokit.cmake")+include("../../../../cargokit/cmake/cargokit.cmake")apply_cargokit(${PROJECT_NAME} ../../../../../rust/bindings/frb/photos ente_photos_rust "")# List of absolute paths to libraries that should be bundled with the plugin.diff --git a/mobile/apps/photos/rust_builder/macos/ente_photos_rust.podspec b/mobile/apps/photos/rust_builder/macos/ente_photos_rust.podspecindex 44ed1c8235..15f2610f43 100644--- a/mobile/apps/photos/rust_builder/macos/ente_photos_rust.podspec+++ b/mobile/apps/photos/rust_builder/macos/ente_photos_rust.podspec@@ -26,7 +26,7 @@ A new Flutter FFI plugin project.s.script_phase = {:name => 'Build Rust library',# First argument is relative path to the `rust` folder, second is name of rust library- :script => 'sh "$PODS_TARGET_SRCROOT/../cargokit/build_pod.sh" ../../../../../rust/bindings/frb/photos ente_photos_rust',+ :script => 'sh "$(cd -P "$PODS_TARGET_SRCROOT" && pwd)/../../../../cargokit/build_pod.sh" ../../../../../rust/bindings/frb/photos ente_photos_rust',:execution_position => :before_compile,:input_files => ['${BUILT_PRODUCTS_DIR}/cargokit_phony'],# Let XCode know that the static library referenced in -force_load below isdiff --git a/mobile/apps/photos/rust_builder/windows/CMakeLists.txt b/mobile/apps/photos/rust_builder/windows/CMakeLists.txtindex 75ad2d3417..f4e27cf13d 100644--- a/mobile/apps/photos/rust_builder/windows/CMakeLists.txt+++ b/mobile/apps/photos/rust_builder/windows/CMakeLists.txt@@ -8,7 +8,7 @@ cmake_minimum_required(VERSION 3.14)set(PROJECT_NAME "ente_photos_rust")project(${PROJECT_NAME} LANGUAGES CXX)-include("../cargokit/cmake/cargokit.cmake")+include("../../../../cargokit/cmake/cargokit.cmake")apply_cargokit(${PROJECT_NAME} ../../../../../../../../../rust/bindings/frb/photos ente_photos_rust "")# List of absolute paths to libraries that should be bundled with the plugin.diff --git a/mobile/cargokit/.gitignore b/mobile/cargokit/.gitignorenew file mode 100644index 0000000000..88aec12b6e--- /dev/null+++ b/mobile/cargokit/.gitignore@@ -0,0 +1,2 @@+target/+build_tool/pubspec.lockdiff --git a/mobile/apps/photos/rust_builder/cargokit/LICENSE b/mobile/cargokit/LICENSEsimilarity index 100%rename from mobile/apps/photos/rust_builder/cargokit/LICENSErename to mobile/cargokit/LICENSEdiff --git a/mobile/apps/photos/rust_builder/cargokit/README b/mobile/cargokit/READMEsimilarity index 100%rename from mobile/apps/photos/rust_builder/cargokit/READMErename to mobile/cargokit/READMEdiff --git a/mobile/apps/photos/rust_builder/cargokit/build_pod.sh b/mobile/cargokit/build_pod.shsimilarity index 100%rename from mobile/apps/photos/rust_builder/cargokit/build_pod.shrename to mobile/cargokit/build_pod.shdiff --git a/mobile/apps/photos/rust_builder/cargokit/build_tool/README.md b/mobile/cargokit/build_tool/README.mdsimilarity index 100%rename from mobile/apps/photos/rust_builder/cargokit/build_tool/README.mdrename to mobile/cargokit/build_tool/README.mddiff --git a/mobile/apps/photos/rust_builder/cargokit/build_tool/analysis_options.yaml b/mobile/cargokit/build_tool/analysis_options.yamlsimilarity index 100%rename from mobile/apps/photos/rust_builder/cargokit/build_tool/analysis_options.yamlrename to mobile/cargokit/build_tool/analysis_options.yamldiff --git a/mobile/apps/photos/rust_builder/cargokit/build_tool/bin/build_tool.dart b/mobile/cargokit/build_tool/bin/build_tool.dartsimilarity index 100%rename from mobile/apps/photos/rust_builder/cargokit/build_tool/bin/build_tool.dartrename to mobile/cargokit/build_tool/bin/build_tool.dartdiff --git a/mobile/apps/photos/rust_builder/cargokit/build_tool/lib/build_tool.dart b/mobile/cargokit/build_tool/lib/build_tool.dartsimilarity index 100%rename from mobile/apps/photos/rust_builder/cargokit/build_tool/lib/build_tool.dartrename to mobile/cargokit/build_tool/lib/build_tool.dartdiff --git a/mobile/apps/photos/rust_builder/cargokit/build_tool/lib/src/android_environment.dart b/mobile/cargokit/build_tool/lib/src/android_environment.dartsimilarity index 100%rename from mobile/apps/photos/rust_builder/cargokit/build_tool/lib/src/android_environment.dartrename to mobile/cargokit/build_tool/lib/src/android_environment.dartdiff --git a/mobile/apps/photos/rust_builder/cargokit/build_tool/lib/src/artifacts_provider.dart b/mobile/cargokit/build_tool/lib/src/artifacts_provider.dartsimilarity index 100%rename from mobile/apps/photos/rust_builder/cargokit/build_tool/lib/src/artifacts_provider.dartrename to mobile/cargokit/build_tool/lib/src/artifacts_provider.dartdiff --git a/mobile/apps/photos/rust_builder/cargokit/build_tool/lib/src/build_cmake.dart b/mobile/cargokit/build_tool/lib/src/build_cmake.dartsimilarity index 100%rename from mobile/apps/photos/rust_builder/cargokit/build_tool/lib/src/build_cmake.dartrename to mobile/cargokit/build_tool/lib/src/build_cmake.dartdiff --git a/mobile/apps/photos/rust_builder/cargokit/build_tool/lib/src/build_gradle.dart b/mobile/cargokit/build_tool/lib/src/build_gradle.dartsimilarity index 100%rename from mobile/apps/photos/rust_builder/cargokit/build_tool/lib/src/build_gradle.dartrename to mobile/cargokit/build_tool/lib/src/build_gradle.dartdiff --git a/mobile/apps/photos/rust_builder/cargokit/build_tool/lib/src/build_pod.dart b/mobile/cargokit/build_tool/lib/src/build_pod.dartsimilarity index 100%rename from mobile/apps/photos/rust_builder/cargokit/build_tool/lib/src/build_pod.dartrename to mobile/cargokit/build_tool/lib/src/build_pod.dartdiff --git a/mobile/apps/photos/rust_builder/cargokit/build_tool/lib/src/build_tool.dart b/mobile/cargokit/build_tool/lib/src/build_tool.dartsimilarity index 100%rename from mobile/apps/photos/rust_builder/cargokit/build_tool/lib/src/build_tool.dartrename to mobile/cargokit/build_tool/lib/src/build_tool.dartdiff --git a/mobile/apps/photos/rust_builder/cargokit/build_tool/lib/src/builder.dart b/mobile/cargokit/build_tool/lib/src/builder.dartsimilarity index 100%rename from mobile/apps/photos/rust_builder/cargokit/build_tool/lib/src/builder.dartrename to mobile/cargokit/build_tool/lib/src/builder.dartdiff --git a/mobile/apps/photos/rust_builder/cargokit/build_tool/lib/src/cargo.dart b/mobile/cargokit/build_tool/lib/src/cargo.dartsimilarity index 100%rename from mobile/apps/photos/rust_builder/cargokit/build_tool/lib/src/cargo.dartrename to mobile/cargokit/build_tool/lib/src/cargo.dartdiff --git a/mobile/apps/photos/rust_builder/cargokit/build_tool/lib/src/crate_hash.dart b/mobile/cargokit/build_tool/lib/src/crate_hash.dartsimilarity index 100%rename from mobile/apps/photos/rust_builder/cargokit/build_tool/lib/src/crate_hash.dartrename to mobile/cargokit/build_tool/lib/src/crate_hash.dartdiff --git a/mobile/apps/photos/rust_builder/cargokit/build_tool/lib/src/environment.dart b/mobile/cargokit/build_tool/lib/src/environment.dartsimilarity index 100%rename from mobile/apps/photos/rust_builder/cargokit/build_tool/lib/src/environment.dartrename to mobile/cargokit/build_tool/lib/src/environment.dartdiff --git a/mobile/apps/photos/rust_builder/cargokit/build_tool/lib/src/logging.dart b/mobile/cargokit/build_tool/lib/src/logging.dartsimilarity index 100%rename from mobile/apps/photos/rust_builder/cargokit/build_tool/lib/src/logging.dartrename to mobile/cargokit/build_tool/lib/src/logging.dartdiff --git a/mobile/apps/photos/rust_builder/cargokit/build_tool/lib/src/options.dart b/mobile/cargokit/build_tool/lib/src/options.dartsimilarity index 100%rename from mobile/apps/photos/rust_builder/cargokit/build_tool/lib/src/options.dartrename to mobile/cargokit/build_tool/lib/src/options.dartdiff --git a/mobile/apps/photos/rust_builder/cargokit/build_tool/lib/src/precompile_binaries.dart b/mobile/cargokit/build_tool/lib/src/precompile_binaries.dartsimilarity index 100%rename from mobile/apps/photos/rust_builder/cargokit/build_tool/lib/src/precompile_binaries.dartrename to mobile/cargokit/build_tool/lib/src/precompile_binaries.dartdiff --git a/mobile/apps/photos/rust_builder/cargokit/build_tool/lib/src/rustup.dart b/mobile/cargokit/build_tool/lib/src/rustup.dartsimilarity index 100%rename from mobile/apps/photos/rust_builder/cargokit/build_tool/lib/src/rustup.dartrename to mobile/cargokit/build_tool/lib/src/rustup.dartdiff --git a/mobile/apps/photos/rust_builder/cargokit/build_tool/lib/src/target.dart b/mobile/cargokit/build_tool/lib/src/target.dartsimilarity index 100%rename from mobile/apps/photos/rust_builder/cargokit/build_tool/lib/src/target.dartrename to mobile/cargokit/build_tool/lib/src/target.dartdiff --git a/mobile/apps/photos/rust_builder/cargokit/build_tool/lib/src/util.dart b/mobile/cargokit/build_tool/lib/src/util.dartsimilarity index 100%rename from mobile/apps/photos/rust_builder/cargokit/build_tool/lib/src/util.dartrename to mobile/cargokit/build_tool/lib/src/util.dartdiff --git a/mobile/apps/photos/rust_builder/cargokit/build_tool/lib/src/verify_binaries.dart b/mobile/cargokit/build_tool/lib/src/verify_binaries.dartsimilarity index 100%rename from mobile/apps/photos/rust_builder/cargokit/build_tool/lib/src/verify_binaries.dartrename to mobile/cargokit/build_tool/lib/src/verify_binaries.dartdiff --git a/mobile/apps/photos/rust_builder/cargokit/build_tool/pubspec.yaml b/mobile/cargokit/build_tool/pubspec.yamlsimilarity index 100%rename from mobile/apps/photos/rust_builder/cargokit/build_tool/pubspec.yamlrename to mobile/cargokit/build_tool/pubspec.yamldiff --git a/mobile/apps/photos/rust_builder/cargokit/cmake/cargokit.cmake b/mobile/cargokit/cmake/cargokit.cmakesimilarity index 100%rename from mobile/apps/photos/rust_builder/cargokit/cmake/cargokit.cmakerename to mobile/cargokit/cmake/cargokit.cmakediff --git a/mobile/apps/photos/rust_builder/cargokit/cmake/resolve_symlinks.ps1 b/mobile/cargokit/cmake/resolve_symlinks.ps1similarity index 100%rename from mobile/apps/photos/rust_builder/cargokit/cmake/resolve_symlinks.ps1rename to mobile/cargokit/cmake/resolve_symlinks.ps1diff --git a/mobile/apps/photos/rust_builder/cargokit/gradle/plugin.gradle b/mobile/cargokit/gradle/plugin.gradlesimilarity index 100%rename from mobile/apps/photos/rust_builder/cargokit/gradle/plugin.gradlerename to mobile/cargokit/gradle/plugin.gradlediff --git a/mobile/apps/photos/rust_builder/cargokit/run_build_tool.cmd b/mobile/cargokit/run_build_tool.cmdsimilarity index 100%rename from mobile/apps/photos/rust_builder/cargokit/run_build_tool.cmdrename to mobile/cargokit/run_build_tool.cmddiff --git a/mobile/apps/photos/rust_builder/cargokit/run_build_tool.sh b/mobile/cargokit/run_build_tool.shsimilarity index 100%rename from mobile/apps/photos/rust_builder/cargokit/run_build_tool.shrename to mobile/cargokit/run_build_tool.sh