Update to newer nswrap, gogio.

README.md

@@ -7,6 +7,6 @@ in `examples/sensors`. To try it on your Android device:
 go install gioui.org/cmd/gogio
 go get git.wow.st/gmp/android-go/examples/sensors
 cd $GOPATH/src/git.wow.st/gmp/android-go/examples/sensors
-gogio -target android .
+gogio -target android -minsdk 27 .
 adb install -r sensors.apk
 ```

android27.yaml

@@ -25,7 +25,7 @@ functionignore:
   - wcstoimax
   - wcstoumax
   - imaxdiv
-  - __system_property_get
+#  - __system_property_get
 enums:
   - .*
 typesubs:

android28.yaml

@@ -0,0 +1,34 @@
+package: android28
+libraries: [android, log, nativewindow, m]
+inputfiles:
+  - $ANDROID_HOME/ndk-bundle/sysroot/usr/include/android/native_window.h
+  - $ANDROID_HOME/ndk-bundle/sysroot/usr/include/android/log.h
+  - $ANDROID_HOME/ndk-bundle/sysroot/usr/include/android/sensor.h
+  - $ANDROID_HOME/ndk-bundle/sysroot/usr/include/jni.h
+  - $ANDROID_HOME/ndk-bundle/sysroot/usr/include/sys/stat.h
+sysimports:
+  - android/native_window.h
+  - android/log.h
+  - android/sensor.h
+  - jni.h
+  - stdlib.h
+  - sys/stat.h
+functions:
+  - .*
+functionignore:
+  - JNI_CreateJavaVM
+  - JNI_GetCreatedJavaVMs
+  - JNI_GetDefaultJavaVMInitArgs
+  - JNI_OnLoad
+  - JNI_OnUnload
+  - AHardwareBuffer_lockPlanes
+  - wcstoimax
+  - wcstoumax
+  - imaxdiv
+#  - __system_property_get
+enums:
+  - .*
+typesubs:
+  Stat: Stat_t
+  Stat64: Stat64_t
+clang: $ANDROID_HOME/ndk-bundle/toolchains/llvm/prebuilt/darwin-x86_64/bin/aarch64-linux-android28-clang

android29.yaml

@@ -0,0 +1,34 @@
+package: android29
+libraries: [android, log, nativewindow, m]
+inputfiles:
+  - $ANDROID_HOME/ndk-bundle/sysroot/usr/include/android/native_window.h
+  - $ANDROID_HOME/ndk-bundle/sysroot/usr/include/android/log.h
+  - $ANDROID_HOME/ndk-bundle/sysroot/usr/include/android/sensor.h
+  - $ANDROID_HOME/ndk-bundle/sysroot/usr/include/jni.h
+  - $ANDROID_HOME/ndk-bundle/sysroot/usr/include/sys/stat.h
+sysimports:
+  - android/native_window.h
+  - android/log.h
+  - android/sensor.h
+  - jni.h
+  - stdlib.h
+  - sys/stat.h
+functions:
+  - .*
+functionignore:
+  - JNI_CreateJavaVM
+  - JNI_GetCreatedJavaVMs
+  - JNI_GetDefaultJavaVMInitArgs
+  - JNI_OnLoad
+  - JNI_OnUnload
+  - AHardwareBuffer_lockPlanes
+  - wcstoimax
+  - wcstoumax
+  - imaxdiv
+#  - __system_property_get
+enums:
+  - .*
+typesubs:
+  Stat: Stat_t
+  Stat64: Stat64_t
+clang: $ANDROID_HOME/ndk-bundle/toolchains/llvm/prebuilt/darwin-x86_64/bin/aarch64-linux-android29-clang

examples/sensors/android.go

@@ -9,8 +9,8 @@ import (
 	"log"
 	"os"
 
-	ndk "git.wow.st/gmp/android-go/android27"
 	"gioui.org/app"
+	ndk "git.wow.st/gmp/android-go/android27"
 )
 
 var (
@@ -22,7 +22,7 @@ func mkHomeDir() {
 	ndk.AndroidLogWrite(ndk.ANDROID_LOG_WARN, tag, msg)
 	msg.Free()
 
-	godir,_ := app.DataDir()
+	godir, _ := app.DataDir()
 	labchan <- fmt.Sprintf("DataDir is %s", godir)
 
 	msg = ndk.CharWithGoString("ok. calling mkdir")

examples/sensors/main.go

@@ -3,8 +3,8 @@
 package main
 
 import (
-	"log"
 	"image/color"
+	"log"
 
 	"gioui.org/app"
 	"gioui.org/layout"
@@ -12,14 +12,14 @@ import (
 	"gioui.org/text/shape"
 	"gioui.org/unit"
 
-	"golang.org/x/image/font/sfnt"
 	"golang.org/x/image/font/gofont/goregular"
+	"golang.org/x/image/font/sfnt"
 )
 
 var (
-	face text.Face
+	face  text.Face
 	white = color.RGBA{A: 0xff, R: 0xff, G: 0xff, B: 0xff}
-	gray = color.RGBA{A: 0xff, R: 0xb0, G: 0xb0, B: 0xb0}
+	gray  = color.RGBA{A: 0xff, R: 0xb0, G: 0xb0, B: 0xb0}
 	black = color.RGBA{A: 0xff, R: 0x00, G: 0x00, B: 0x00}
 
 	labchan chan string
@@ -34,7 +34,7 @@ func main() {
 }
 
 func diffInsets(x, y app.Insets) bool {
-	return  x.Top != y.Top ||
+	return x.Top != y.Top ||
 		x.Bottom != y.Bottom ||
 		x.Left != y.Left ||
 		x.Right != y.Right
@@ -49,7 +49,9 @@ func eventloop() {
 	var faces shape.Faces
 
 	regular, err := sfnt.Parse(goregular.TTF)
-	if err != nil { log.Fatal("Cannot parse font.") }
+	if err != nil {
+		log.Fatal("Cannot parse font.")
+	}
 	face = faces.For(regular, unit.Sp(16))
 
 	sysinset := &layout.Inset{}
@@ -67,7 +69,7 @@ func eventloop() {
 	for {
 		select {
 		case x := <-labchan:
-			labels = append(labels,&text.Label{Face: face, Text: x})
+			labels = append(labels, &text.Label{Face: face, Text: x})
 		case e := <-w.Events():
 			switch e := e.(type) {
 			case app.DestroyEvent:
@@ -90,4 +92,3 @@ func eventloop() {
 		}
 	}
 }
-