Просмотр исходного кода

Docker build will now first get missing dependencies

Adam Pritchard 11 лет назад
Родитель
Сommit
148ba3bc94
2 измененных файлов с 13 добавлено и 1 удалено
  1. 1 1
      AndroidLibrary/Dockerfile
  2. 12 0
      AndroidLibrary/make.bash

+ 1 - 1
AndroidLibrary/Dockerfile

@@ -63,4 +63,4 @@ RUN echo "INSTALLING GO" && \
   ./all.bash && \
   CC_FOR_TARGET=$NDK_ROOT/bin/arm-linux-androideabi-gcc GOOS=android GOARCH=arm GOARM=7 ./make.bash
 
-WORKDIR $GOPATH/src/golang.org/x/mobile
+WORKDIR $GOPATH/src

+ 12 - 0
AndroidLibrary/make.bash

@@ -9,8 +9,20 @@ fi
 
 ANDROID_APP=$PWD
 
+# Make sure we have our dependencies
+echo 'go-getting dependencies...'
+go get -d -v ./...
+
+# Force an update of the go-mobile package, since it's being improved rapidly
+# NOTE: for some reason this either doesn't complete or stalls for a very long time.
+#echo 'Updating go-mobile...'
+#go get -u -d -v golang.org/x/mobile/...
+
+echo 'Building library...'
 CGO_ENABLED=1 GOOS=android GOARCH=arm GOARM=7 \
   go build -a -v -ldflags="-shared" -o libgojni.so ./libpsi
 
 mkdir -p libs/armeabi-v7a
 mv -f libgojni.so libs/armeabi-v7a/libgojni.so
+
+echo 'Library can be found at: libs/armeabi-v7a/libgojni.so'