diff --git a/.travis.yml b/.travis.yml index 4c2cc2dd8..8f541b5c8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,6 @@ env: global: - FRAMEWORK_NAME=ApplicationServices.framework.zip -before_install: - - brew install sqlcipher --with-fts before_deploy: - rustup target add aarch64-apple-ios armv7-apple-ios i386-apple-ios x86_64-apple-ios - cargo install cargo-lipo diff --git a/components/logins/ios/Logins.xcodeproj/project.pbxproj b/components/logins/ios/Logins.xcodeproj/project.pbxproj index 1f32033d7..d0454b5a2 100644 --- a/components/logins/ios/Logins.xcodeproj/project.pbxproj +++ b/components/logins/ios/Logins.xcodeproj/project.pbxproj @@ -191,7 +191,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "cd \"$SRCROOT\"/../ffi\n# We can't use cargo lipo because we can't link to universal libraries :(\n# https://github.com/rust-lang/rust/issues/55235\nLIBS_ARCHS=(\"i386\" \"x86_64\" \"armv7\" \"arm64\")\nIOS_TRIPLES=(\"i386-apple-ios\" \"x86_64-apple-ios\" \"armv7-apple-ios\" \"aarch64-apple-ios\")\nfor i in \"${!LIBS_ARCHS[@]}\"; do\n LIB_ARCH=${LIBS_ARCHS[$i]}\n env -i PATH=$PATH \\\n OPENSSL_STATIC=1 \\\n OPENSSL_DIR=\"$SRCROOT\"/../../../libs/ios/$LIB_ARCH/openssl \\\n SQLCIPHER_LIB_DIR=\"$SRCROOT\"/../../../libs/ios/$LIB_ARCH/sqlcipher/lib \\\n SQLCIPHER_INCLUDE_DIR=\"$SRCROOT\"/../../../libs/ios/$LIB_ARCH/sqlcipher/include \\\n \"$HOME\"/.cargo/bin/cargo build --lib --release --target ${IOS_TRIPLES[$i]}\ndone\nmkdir -p \"$SRCROOT\"/../../../target/universal/release\nlipo -create -output \"$SRCROOT\"/../../../target/universal/release/liblogins_ffi.a \\\n\"$SRCROOT\"/../../../target/i386-apple-ios/release/liblogins_ffi.a \\\n\"$SRCROOT\"/../../../target/x86_64-apple-ios/release/liblogins_ffi.a \\\n\"$SRCROOT\"/../../../target/armv7-apple-ios/release/liblogins_ffi.a \\\n\"$SRCROOT\"/../../../target/aarch64-apple-ios/release/liblogins_ffi.a \\\n"; + shellScript = "pushd \"$SRCROOT\"/../../../libs\nenv -i PATH=\"$PATH\" HOME=\"$HOME\" ./build-all.sh ios\npopd\ncd \"$SRCROOT\"/../ffi\n# We can't use cargo lipo because we can't link to universal libraries :(\n# https://github.com/rust-lang/rust/issues/55235\nLIBS_ARCHS=(\"i386\" \"x86_64\" \"armv7\" \"arm64\")\nIOS_TRIPLES=(\"i386-apple-ios\" \"x86_64-apple-ios\" \"armv7-apple-ios\" \"aarch64-apple-ios\")\nfor i in \"${!LIBS_ARCHS[@]}\"; do\n LIB_ARCH=${LIBS_ARCHS[$i]}\n env -i PATH=\"$PATH\" \\\n OPENSSL_STATIC=1 \\\n OPENSSL_DIR=\"$SRCROOT\"/../../../libs/ios/$LIB_ARCH/openssl \\\n SQLCIPHER_LIB_DIR=\"$SRCROOT\"/../../../libs/ios/$LIB_ARCH/sqlcipher/lib \\\n SQLCIPHER_INCLUDE_DIR=\"$SRCROOT\"/../../../libs/ios/$LIB_ARCH/sqlcipher/include \\\n \"$HOME\"/.cargo/bin/cargo build --lib --release --target ${IOS_TRIPLES[$i]}\ndone\nmkdir -p \"$SRCROOT\"/../../../target/universal/release\nlipo -create -output \"$SRCROOT\"/../../../target/universal/release/liblogins_ffi.a \\\n\"$SRCROOT\"/../../../target/i386-apple-ios/release/liblogins_ffi.a \\\n\"$SRCROOT\"/../../../target/x86_64-apple-ios/release/liblogins_ffi.a \\\n\"$SRCROOT\"/../../../target/armv7-apple-ios/release/liblogins_ffi.a \\\n\"$SRCROOT\"/../../../target/aarch64-apple-ios/release/liblogins_ffi.a \\\n"; }; /* End PBXShellScriptBuildPhase section */