Conversation
DeX launch failed on Apple Silicon Macs without Rosetta because the bundled tools were x86_64 only: scrcpy exited before its window was ready. The repository now ships scrcpy per architecture and the ADB proxy under tools/adb-proxy/osx-arm64 and tools/adb-proxy/osx-x64, so the Mac build has to pick the slice that matches the running CPU. - MacPathProvider resolves ADB, scrcpy and the ADB proxy for the running CPU and prefers the architecture specific scrcpy folder over the legacy x86_64 build. - MacExecutableInspector reads thin and universal Mach-O headers so a bundled binary is only selected when this Mac can execute it. - AdbProxyLocator is shared by FileTransferCoordinator and EnvironmentCheckService so managed file transfer launches the proxy that matches the running CPU, with the previous fallback order kept for Windows and for machines without an architecture folder. - InteractiveHost re-resolves stored ADB and scrcpy paths that cannot run on this Mac. - Tests cover the architecture ordered candidates, Mach-O inspection and the proxy fallback.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Apple Silicon과 Intel Mac에서 각각 맞는 scrcpy와 ADB proxy 바이너리를 선택하도록 수정
Rosetta 없이 Apple Silicon에서 실행 실패하던 문제 해결
아키텍처별 fallback 및 테스트 추가
직접 Apple Silicon과 Intel Mac에서 수행해 보고 올려 드립니다. 수정은 별거 없어요. tools 폴더에 아키텍처별로 수행되게 고쳤네요.