Rooba
/
perkeep
mirror of https://github.com/perkeep/perkeep.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

android: build client with Go 1.7 

Change-Id: I7736a10a6a3e30408643e678b7f8fc942f028ff7
This commit is contained in:
Tilman Dilo 2016-09-05 21:16:52 +02:00
parent bf001df550
commit 555cc5fca6
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clients/android/build-in-docker.pl
View File

@ -32,7 +32,7 @@ system("cp", "-p", "$GENDIR/camput", "$ASSETS/camput.arm")
# TODO(bradfitz): make these values automatic, and don't make the
# "Version" menu say "camput version" when it runs. Also maybe
# keep a history of these somewhere more convenient.
print $vfh "app 0.6.1 camput 0.9 go 1.6.2";
print $vfh "app 0.6.1 camput 0.9 go 1.7";
}
chdir $ASSETS or die "can't cd to assets dir";

6
clients/android/devenv/Dockerfile
View File

@ -17,9 +17,9 @@ RUN echo y | android update sdk -u -t android-17
# Get Go stable release
WORKDIR /tmp
RUN curl -O https://storage.googleapis.com/golang/go1.6.2.linux-amd64.tar.gz
RUN echo 'e40c36ae71756198478624ed1bb4ce17597b3c19d243f3f0899bb5740d56212a go1.6.2.linux-amd64.tar.gz' | sha256sum -c
RUN tar -C /usr/local -xzf go1.6.2.linux-amd64.tar.gz
RUN curl -O https://storage.googleapis.com/golang/go1.7.linux-amd64.tar.gz
RUN echo '702ad90f705365227e902b42d91dd1a40e48ca7f67a2f4b2fd052aaa4295cd95 go1.7.linux-amd64.tar.gz' | sha256sum -c
RUN tar -C /usr/local -xzf go1.7.linux-amd64.tar.gz
ENV ANDROID_HOME /usr/local/android-sdk-linux
ENV ANT_HOME /usr/local/apache-ant-1.9.2