joejulian/gio-patched
1
0
Fork 0
forked from joejulian/gio
Code Pull Requests 1 Activity

cmd/gogio: [Android] check $ANDROID_NDK_ROOT

Browse Source 
If the Android NDK is not found in a standard location (e.g. you are
on an F-Droid build server), check the $ANDROID_NDK_ROOT environment
variable.

Signed-off-by: Greg Pomerantz <gmp.gio@wow.st>
This commit is contained in:
Greg Pomerantz
2020-06-22 11:50:05 -04:00
committed by Elias Naur
parent b664d68a7c
commit 3a542cc80c
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/gogio/androidbuild.go
+9 -1
View File
@@ -591,7 +591,15 @@ func findNDK(androidHome string) (string, error) {
if _, err := os.Stat(ndkBundle); err == nil {
return ndkBundle, nil
}
return "", fmt.Errorf("no NDK found in $ANDROID_HOME (%s). Use `sdkmanager ndk-bundle` to install it", androidHome)
// Certain non-standard NDK isntallations set the $ANDROID_NDK_ROOT
// environment variable
if ndkBundle, ok := os.LookupEnv("ANDROID_NDK_ROOT"); ok {
if _, err := os.Stat(ndkBundle); err == nil {
return ndkBundle, nil
}
}
return "", fmt.Errorf("no NDK found in $ANDROID_HOME (%s). Set $ANDROID_NDK_ROOT or use `sdkmanager ndk-bundle` to install the NDK", androidHome)
}
func findKeytool() (string, error) {