From 24ba39121fa3e347daf6ac289dad7af4534f4086 Mon Sep 17 00:00:00 2001 From: Mihai Parparita Date: Tue, 11 Apr 2023 10:00:57 -0700 Subject: [PATCH] README.md: update macOS instructions The JRE path has changed in more recent versions of Android Studio. Also make it more explicit how to get the `adb` tool in the search path. --- README.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 860fa76..85b9013 100644 --- a/README.md +++ b/README.md @@ -101,14 +101,15 @@ adb shell pm uninstall com.tailscale.ipn To build from the CLI on macOS: -1. Install Android Studio +1. Install Android Studio (when asked which SDKs to install, choose 31 or the current value of targetSdkVersion in `build.gradle`) 2. In Android Studio's home screen: "More Actions" > "SDK Manager", install NDK. 3. You can now close Android Studio, unless you want it to create virtual devices ("More Actions" > "Virtual Device Manager"). 4. Then, from CLI: -5. `export JAVA_HOME='/Applications/Android Studio.app/Contents/jre/Contents/Home'` +5. `export JAVA_HOME='/Applications/Android Studio.app/Contents/jbr/Contents/Home'` 6. `export ANDROID_SDK_ROOT=$HOME/Library/Android/sdk` -7. `make tailscale-fdroid.apk`, etc +7. `export PATH=$ANDROID_SDK_ROOT/platform-tools:$PATH` (to allow `adb` and the like to work) +8. `make tailscale-fdroid.apk`, etc ## Bugs