Edison Jwa
a589ac953f
The Apple CoreML Silero VAD backend resolves six @_cdecl Swift symbols
via dlsym(RTLD_DEFAULT) at runtime in the Rust audio crate. Local
flutter build paths preserved those symbols, but Xcode Archive (the
path used for TestFlight and App Store uploads) silently stripped them
through two independent mechanisms, causing Rust to fall back to
WebRTC VAD on every shipped build.
Both stripping mechanisms are now neutralised:
* ld dead-strip: OTHER_LDFLAGS now whitelists each of the six
chanora_silero_vad_* symbols via repeated `-Xlinker -exported_symbol`
pairs in ios/Flutter/{Release,Debug}.xcconfig and
macos/Flutter/Flutter-{Release,Debug}.xcconfig.
* install-time strip: STRIP_STYLE is set to `non-global` in the same
four xcconfigs so the post-link strip phase no longer drops exported
global text symbols from the Archive product. Cost: ~264 bytes per
binary; verified `xcrun strip` vs `xcrun strip -x` behaviour.
Self-test wired into both AppDelegates: at launch on a utility queue,
ChanoraSileroSelfTest resolves all six symbols through dlsym (the same
path the Rust runtime uses, not a direct call that would mask the bug
class) and exercises create → reset → process → destroy. Result is
logged via NSLog and surfaces in Console.app / idevicesyslog.
A post-link verify_silero_exports.sh build phase runs nm -gU on the
final Archive binary and fails the build if any of the six symbols are
missing. Empirically caught the original Archive regression that
flutter build --no-codesign did not.
CocoaPods bridge podspecs now emit a proper .dSYM via dsymutil so
TestFlight crash reports are symbolicated; Cargo.toml release profile
sets `debug = true` because dsymutil needs DWARF in the input dylib.
macOS chanora_bridge.podspec PATH inserts /opt/homebrew/opt/rustup/bin
ahead of /opt/homebrew/bin so rustup's cargo (which has the
x86_64-apple-darwin target installed) wins over the homebrew rust
formula that is aarch64-only.
iOS Podfile target renamed from `Runner` to `Chanora` to match the
Xcode target name shipped in the project (the workspace and scheme
already referenced Chanora; the Podfile mismatch produced lint
warnings during `pod install`).
ITSAppUsesNonExemptEncryption=false declared in both Info.plist files
so TestFlight and App Store Connect uploads skip the export-compliance
prompt; Chanora uses only platform-provided TLS.
.gitignore now covers Xcode archive bundles, IPA exports, dSYM
directories, the local macOS release zip, and agent/tooling state
directories so generated TestFlight artifacts no longer appear in
git status.
End-to-end verified by headless archive:
xcodebuild -workspace Runner.xcworkspace -scheme Runner \
-configuration Release -destination 'generic/platform=iOS' \
-archivePath /tmp/chanora.xcarchive archive CODE_SIGNING_ALLOWED=NO
nm -gU on the resulting .app/Chanora binary shows all six
chanora_silero_vad_* symbols present.
244 lines
11 KiB
Ruby
244 lines
11 KiB
Ruby
#
|
|
# chanora_bridge — Rust bridge library as a CocoaPods-vended dynamic framework
|
|
# (macOS edition).
|
|
#
|
|
# What this file does:
|
|
#
|
|
# 1. `prepare_command` runs once per `pod install` and once per archive
|
|
# / device build. It:
|
|
# a) Invokes `cargo build --release` for both `aarch64-apple-darwin`
|
|
# (Apple Silicon) and `x86_64-apple-darwin` (Intel).
|
|
# b) Uses `lipo` to merge the two into a universal binary.
|
|
# c) Wraps the universal dylib in a proper `chanora_bridge.framework`
|
|
# bundle (Versions/A layout with the right Info.plist).
|
|
# d) Rewrites LC_ID_DYLIB to
|
|
# @rpath/chanora_bridge.framework/Versions/A/chanora_bridge so dyld
|
|
# resolves it as a framework when embedded in Runner.app.
|
|
#
|
|
# 2. `vendored_frameworks` exposes the result to the Pods workspace.
|
|
# CocoaPods then integrates the framework into Runner.xcodeproj
|
|
# with the appropriate embed phase.
|
|
#
|
|
# Path note: this podspec lives at apps/chanora_flutter/macos/, and
|
|
# refers to the Rust workspace at ../../.. (repo root). The
|
|
# prepare_command runs with PWD = the directory of this file, so all
|
|
# paths are relative to apps/chanora_flutter/macos/.
|
|
|
|
require_relative 'macos_deployment_target'
|
|
|
|
Pod::Spec.new do |s|
|
|
s.name = 'chanora_bridge'
|
|
s.version = '1.0.0'
|
|
s.summary = 'Chanora Rust bridge (libchanora_bridge) as a macOS framework.'
|
|
s.description = <<-DESC
|
|
Vendors the Rust-built libchanora_bridge as chanora_bridge.framework so
|
|
flutter_rust_bridge's runtime loader can dlopen it on macOS.
|
|
DESC
|
|
s.homepage = 'https://github.com/EdisonJwa/chanora'
|
|
s.license = { :type => 'Apache-2.0 OR MIT', :text => 'See LICENSE-APACHE / LICENSE-MIT at the repo root' }
|
|
s.author = { 'EdisonJwa' => 'me@edison.network' }
|
|
s.source = { :path => '.' }
|
|
s.platform = :osx, MACOS_BRIDGE_DEPLOYMENT_TARGET
|
|
|
|
# Build the Rust bridge on `pod install`. The script runs under
|
|
# bash; we use `set -e` so any failure (cargo missing, target not
|
|
# installed, link error) aborts the install loudly.
|
|
s.prepare_command = <<-SCRIPT
|
|
set -e
|
|
REPO_ROOT="$(cd ../../.. && pwd)"
|
|
BRIDGE_ARM64="$REPO_ROOT/target/aarch64-apple-darwin/release/libchanora_bridge.dylib"
|
|
BRIDGE_X86_64="$REPO_ROOT/target/x86_64-apple-darwin/release/libchanora_bridge.dylib"
|
|
UNIVERSAL="$REPO_ROOT/target/universal/release/libchanora_bridge.dylib"
|
|
|
|
echo "[chanora_bridge.podspec] cargo build aarch64-apple-darwin"
|
|
cd "$REPO_ROOT"
|
|
PATH="$HOME/.cargo/bin:/opt/homebrew/opt/rustup/bin:/opt/homebrew/bin:$PATH" \\
|
|
MACOSX_DEPLOYMENT_TARGET=#{MACOS_BRIDGE_DEPLOYMENT_TARGET} \\
|
|
CMAKE_POLICY_VERSION_MINIMUM=3.5 \\
|
|
LIBOPUS_STATIC=1 \\
|
|
LIBOPUS_NO_PKG=1 \\
|
|
cargo build --release --target aarch64-apple-darwin -p chanora_bridge
|
|
|
|
echo "[chanora_bridge.podspec] cargo build x86_64-apple-darwin"
|
|
PATH="$HOME/.cargo/bin:/opt/homebrew/opt/rustup/bin:/opt/homebrew/bin:$PATH" \\
|
|
MACOSX_DEPLOYMENT_TARGET=#{MACOS_BRIDGE_DEPLOYMENT_TARGET} \\
|
|
CMAKE_POLICY_VERSION_MINIMUM=3.5 \\
|
|
LIBOPUS_STATIC=1 \\
|
|
LIBOPUS_NO_PKG=1 \\
|
|
cargo build --release --target x86_64-apple-darwin -p chanora_bridge
|
|
|
|
if [ ! -f "$BRIDGE_ARM64" ]; then
|
|
echo "ERROR: arm64 dylib not found at $BRIDGE_ARM64" >&2
|
|
exit 1
|
|
fi
|
|
if [ ! -f "$BRIDGE_X86_64" ]; then
|
|
echo "ERROR: x86_64 dylib not found at $BRIDGE_X86_64" >&2
|
|
exit 1
|
|
fi
|
|
|
|
# Create universal binary with lipo.
|
|
mkdir -p "$(dirname "$UNIVERSAL")"
|
|
lipo -create "$BRIDGE_ARM64" "$BRIDGE_X86_64" -output "$UNIVERSAL"
|
|
echo "[chanora_bridge.podspec] universal binary created"
|
|
|
|
cd "$REPO_ROOT/apps/chanora_flutter/macos"
|
|
|
|
# Build the chanora_bridge.framework layout (Versions/A) in a known
|
|
# location this podspec will then point vendored_frameworks at.
|
|
FW=Frameworks/chanora_bridge.framework
|
|
rm -rf "$FW"
|
|
mkdir -p "$FW/Versions/A/Resources"
|
|
ln -sfh A "$FW/Versions/Current"
|
|
ln -sfh Versions/Current/Resources "$FW/Resources"
|
|
cp "$UNIVERSAL" "$FW/Versions/A/chanora_bridge"
|
|
ln -sfh Versions/Current/chanora_bridge "$FW/chanora_bridge"
|
|
|
|
cat > "$FW/Versions/A/Resources/Info.plist" <<PLIST
|
|
<?xml version="1.0" encoding="UTF-8"?>
|
|
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
|
<plist version="1.0">
|
|
<dict>
|
|
<key>CFBundleExecutable</key><string>chanora_bridge</string>
|
|
<key>CFBundleIdentifier</key><string>app.chanora.bridge</string>
|
|
<key>CFBundleName</key><string>chanora_bridge</string>
|
|
<key>CFBundlePackageType</key><string>FMWK</string>
|
|
<key>CFBundleShortVersionString</key><string>1.0.0</string>
|
|
<key>CFBundleVersion</key><string>1</string>
|
|
<key>CFBundleSupportedPlatforms</key><array><string>MacOSX</string></array>
|
|
<key>MinimumOSVersion</key><string>#{MACOS_BRIDGE_DEPLOYMENT_TARGET}</string>
|
|
</dict>
|
|
</plist>
|
|
PLIST
|
|
|
|
install_name_tool -id "@rpath/chanora_bridge.framework/Versions/A/chanora_bridge" \\
|
|
"$FW/Versions/A/chanora_bridge"
|
|
|
|
# Generate the framework's dSYM bundle. Apple's archive validator
|
|
# rejects uploads when an embedded framework has no matching dSYM
|
|
# (UUID lookup miss in the archive's dSYMs/ folder). dsymutil reads
|
|
# the DWARF that cargo emitted (enabled by [profile.release]
|
|
# debug = true at the workspace root) and writes the bundle next
|
|
# to the framework. We then strip the in-framework binary so the
|
|
# shipped app stays slim; symbols live in the dSYM bundle, which
|
|
# is the layout xcodebuild -exportArchive and notarisation expect.
|
|
rm -rf "$FW.dSYM"
|
|
xcrun dsymutil "$FW/Versions/A/chanora_bridge" -o "$FW.dSYM"
|
|
xcrun strip -S -x "$FW/Versions/A/chanora_bridge"
|
|
echo "[chanora_bridge.podspec] framework + dSYM ready at $FW"
|
|
SCRIPT
|
|
|
|
# Pod CocoaPods picks this up; the framework gets embedded into
|
|
# Runner.app/Contents/Frameworks/ automatically.
|
|
s.vendored_frameworks = 'Frameworks/chanora_bridge.framework'
|
|
|
|
# Re-run the cargo build + framework wrap on every Xcode build,
|
|
# not only on `pod install`. The `prepare_command` above runs
|
|
# once per `pod install` which is too sticky — Rust source
|
|
# changes were getting silently ignored because Xcode happily
|
|
# re-bundled the stale framework. This script_phase shells out to
|
|
# cargo on every Xcode "Build" so the framework is always in sync
|
|
# with the current Rust workspace.
|
|
#
|
|
# `:execution_position => :before_compile` runs the script before
|
|
# Xcode's CompileSources phase, so by the time the linker / embed
|
|
# step sees `Frameworks/chanora_bridge.framework`, it is fresh.
|
|
s.script_phase = {
|
|
:name => 'Rebuild chanora_bridge.framework from Rust',
|
|
:script => <<-SCRIPT,
|
|
set -e
|
|
REPO_ROOT="$(cd "${PODS_TARGET_SRCROOT}/../../.." && pwd)"
|
|
BRIDGE_ARM64="$REPO_ROOT/target/aarch64-apple-darwin/release/libchanora_bridge.dylib"
|
|
BRIDGE_X86_64="$REPO_ROOT/target/x86_64-apple-darwin/release/libchanora_bridge.dylib"
|
|
UNIVERSAL="$REPO_ROOT/target/universal/release/libchanora_bridge.dylib"
|
|
|
|
echo "[chanora_bridge script_phase] cargo build aarch64-apple-darwin"
|
|
cd "$REPO_ROOT"
|
|
PATH="$HOME/.cargo/bin:/opt/homebrew/opt/rustup/bin:/opt/homebrew/bin:$PATH" \
|
|
MACOSX_DEPLOYMENT_TARGET=#{MACOS_BRIDGE_DEPLOYMENT_TARGET} \
|
|
CMAKE_POLICY_VERSION_MINIMUM=3.5 \
|
|
LIBOPUS_STATIC=1 \
|
|
LIBOPUS_NO_PKG=1 \
|
|
cargo build --release --target aarch64-apple-darwin -p chanora_bridge
|
|
|
|
echo "[chanora_bridge script_phase] cargo build x86_64-apple-darwin"
|
|
PATH="$HOME/.cargo/bin:/opt/homebrew/opt/rustup/bin:/opt/homebrew/bin:$PATH" \
|
|
MACOSX_DEPLOYMENT_TARGET=#{MACOS_BRIDGE_DEPLOYMENT_TARGET} \
|
|
CMAKE_POLICY_VERSION_MINIMUM=3.5 \
|
|
LIBOPUS_STATIC=1 \
|
|
LIBOPUS_NO_PKG=1 \
|
|
cargo build --release --target x86_64-apple-darwin -p chanora_bridge
|
|
|
|
cd "$REPO_ROOT/apps/chanora_flutter/macos"
|
|
FW=Frameworks/chanora_bridge.framework
|
|
FW_UP_TO_DATE=0
|
|
|
|
# Skip the wrap step if the framework's binary is already
|
|
# up-to-date with the cargo output (fast no-op on incremental
|
|
# builds where Rust didn't change). We still publish the dSYM
|
|
# into DWARF_DSYM_FOLDER_PATH below so archive builds always
|
|
# have the symbols, even when the framework itself is cached.
|
|
if [ -f "$FW/Versions/A/chanora_bridge" ] && [ "$FW/Versions/A/chanora_bridge" -nt "$BRIDGE_ARM64" ] && [ "$FW/Versions/A/chanora_bridge" -nt "$BRIDGE_X86_64" ]; then
|
|
echo "[chanora_bridge script_phase] framework already up-to-date"
|
|
FW_UP_TO_DATE=1
|
|
fi
|
|
|
|
if [ "$FW_UP_TO_DATE" = 0 ]; then
|
|
# Create universal binary with lipo.
|
|
mkdir -p "$(dirname "$UNIVERSAL")"
|
|
lipo -create "$BRIDGE_ARM64" "$BRIDGE_X86_64" -output "$UNIVERSAL"
|
|
|
|
rm -rf "$FW"
|
|
mkdir -p "$FW/Versions/A/Resources"
|
|
ln -sfh A "$FW/Versions/Current"
|
|
ln -sfh Versions/Current/Resources "$FW/Resources"
|
|
cp "$UNIVERSAL" "$FW/Versions/A/chanora_bridge"
|
|
ln -sfh Versions/Current/chanora_bridge "$FW/chanora_bridge"
|
|
|
|
cat > "$FW/Versions/A/Resources/Info.plist" <<PLIST
|
|
<?xml version="1.0" encoding="UTF-8"?>
|
|
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
|
<plist version="1.0">
|
|
<dict>
|
|
<key>CFBundleExecutable</key><string>chanora_bridge</string>
|
|
<key>CFBundleIdentifier</key><string>app.chanora.bridge</string>
|
|
<key>CFBundleName</key><string>chanora_bridge</string>
|
|
<key>CFBundlePackageType</key><string>FMWK</string>
|
|
<key>CFBundleShortVersionString</key><string>1.0.0</string>
|
|
<key>CFBundleVersion</key><string>1</string>
|
|
<key>CFBundleSupportedPlatforms</key><array><string>MacOSX</string></array>
|
|
<key>MinimumOSVersion</key><string>#{MACOS_BRIDGE_DEPLOYMENT_TARGET}</string>
|
|
</dict>
|
|
</plist>
|
|
PLIST
|
|
|
|
install_name_tool -id "@rpath/chanora_bridge.framework/Versions/A/chanora_bridge" \
|
|
"$FW/Versions/A/chanora_bridge"
|
|
rm -rf "$FW.dSYM"
|
|
xcrun dsymutil "$FW/Versions/A/chanora_bridge" -o "$FW.dSYM"
|
|
xcrun strip -S -x "$FW/Versions/A/chanora_bridge"
|
|
echo "[chanora_bridge script_phase] framework refreshed (with dSYM)"
|
|
fi
|
|
|
|
# Publish the dSYM into Xcode's archive dSYM folder on every
|
|
# build (cached or not). See the iOS podspec for the full
|
|
# rationale — same constraint applies to macOS notarisation
|
|
# and archive-based distribution.
|
|
if [ -n "${DWARF_DSYM_FOLDER_PATH:-}" ] && [ -d "$FW.dSYM" ]; then
|
|
mkdir -p "$DWARF_DSYM_FOLDER_PATH"
|
|
rm -rf "$DWARF_DSYM_FOLDER_PATH/chanora_bridge.framework.dSYM"
|
|
cp -R "$FW.dSYM" "$DWARF_DSYM_FOLDER_PATH/chanora_bridge.framework.dSYM"
|
|
echo "[chanora_bridge script_phase] dSYM published to $DWARF_DSYM_FOLDER_PATH"
|
|
fi
|
|
SCRIPT
|
|
:execution_position => :before_compile,
|
|
}
|
|
|
|
# The pod has no Objective-C sources; it's purely a framework
|
|
# carrier. Suppress CocoaPods's source-file warning.
|
|
s.source_files = 'Frameworks/chanora_bridge.framework/Headers/*.h'
|
|
|
|
# No public Swift / ObjC API to expose — the Flutter app talks to
|
|
# the framework via FRB's FFI symbol lookup at runtime, not via
|
|
# imports.
|
|
end
|