Merge branch 'trunk' into peersettings

.drone.yml

@@ -36,8 +36,9 @@ steps:
       - go list ./... | xargs go vet
       - go list ./... | xargs golint 
         #Todo: fix all the lint errors and add `-set_exit_status` above to enforce linting
+
   - name: build-linux
-    image: openpriv/android-go-mobile:2021
+    image: golang
     volumes:
       - name: deps
         path: /go
@@ -47,6 +48,7 @@ steps:
       event: [ push, pull_request ]
     commands:
       - make linux
+
   - name: build-android
     image: openpriv/android-go-mobile:2021
     volumes:
@@ -57,7 +59,14 @@ steps:
       branch: trunk
       event: [ push, pull_request ]
     commands:
+      - go get golang.org/x/mobile/cmd/gomobile
+      - go get golang.org/x/mobile/cmd/gobind
+      - go get -u golang.org/x/mobile
+      - go get -u golang.org/x/mobile/bind
+      - gomobile clean
+      - gomobile init
       - make android
+
   - name: notify-email
     image: drillster/drone-email
     host: build.openprivacy.ca
@@ -80,5 +89,6 @@ steps:
     gogs_url: https://git.openprivacy.ca
 
 volumes:
+  # gopath where bin and pkg lives to persist across steps
   - name: deps
     temp: {}