CI: install directly from boneyard

Author: mgerhardy

.github/workflows/main.yml

@@ -10,12 +10,8 @@ jobs:
 
         - name: Setup
           run: |
-            brew search box2d
-            brew tap homebrew/boneyard
-            brew versions box2d
-            cd $(brew --prefix)
-            #git checkout 6b8d25f Library/Formula/box2d.rb
-            brew install lua box2d sdl2 sdl2_image sdl2_mixer sdl2_net sqlite zlib yajl upx
+            brew install lua sdl2 sdl2_image sdl2_mixer sdl2_net sqlite zlib yajl upx
+            brew install https://raw.githubusercontent.com/Homebrew/homebrew-boneyard/master/box2d.rb
 
         - name: Build
           run: |

cmake/android.cmake

@@ -23,7 +23,7 @@ if (GRADLE)
 	set(ANDROID_TOOL_FLAGS "${ANDROID_TOOL_FLAGS} -g")
 endif()
 
-set(ANDROID_SDK_TOOL "${ANDROID_SDK_ROOT}/tools/android${ANDROID_SDK_TOOL_EXT}")
+set(ANDROID_SDK_TOOL "${ANDROID_SDK_ROOT}/tools/bin/sdkmanager${ANDROID_SDK_TOOL_EXT}")
 
 if (NOT CMAKE_ANDROID_NDK)
 	message(FATAL_ERROR "ANDROID_NDK environment variable is not set")