Skip to content

Commit

Permalink
Fix build break due to adb ending up in platform-tools/platform-tools (
Browse files Browse the repository at this point in the history
…facebook#202)

Summary:
Brew appears to duplicate `platform-tools` in the installation path.

For now, just support both in case it suddenly reverts back to the correct path.

Pull Request resolved: facebook#202

Reviewed By: avp

Differential Revision: D20681600

Pulled By: willholen

fbshipit-source-id: 6b646914ad0d1e30e54bc2a21f6bca8236ab41f4
  • Loading branch information
willholen authored and facebook-github-bot committed Mar 31, 2020
1 parent 8a82322 commit d47db30
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -453,6 +453,8 @@ jobs:
brew tap homebrew/cask
brew cask install android-sdk
echo 'export PATH="/usr/local/share/android-sdk/platform-tools:/usr/local/share/android-sdk/tools/bin:$PATH"' >> $BASH_ENV
# At some point, adb ended up in platform-tools/platform-tools. Work around that.
echo 'export PATH="/usr/local/share/android-sdk/platform-tools/platform-tools:$PATH"' >> $BASH_ENV
- run:
name: Install emulator dependencies
command: (yes | sdkmanager "platform-tools" "platforms;android-26" "extras;intel;Hardware_Accelerated_Execution_Manager" "build-tools;26.0.0" "system-images;android-26;google_apis;x86" "emulator" --verbose) || true
Expand Down

0 comments on commit d47db30

Please sign in to comment.