Browse Source

Use Java 7 in build image. App now builds in image.

Adam Pritchard 11 years ago
parent
commit
fff1475a53
2 changed files with 2 additions and 2 deletions
  1. 1 1
      AndroidApp/make.bash
  2. 1 1
      AndroidLibrary/Dockerfile

+ 1 - 1
AndroidApp/make.bash

@@ -11,6 +11,6 @@ ANDROID_APP=$PWD
 
 # Build library
 (cd ../AndroidLibrary && ./make.bash)
-mkdir -p app/src/main/jniLibs/armeabi-v7a && cp -f ../AndroidLibrary/libgojni.so app/src/main/jniLibs/armeabi-v7a
+mkdir -p app/src/main/jniLibs/armeabi-v7a && cp -f ../AndroidLibrary/libs/armeabi-v7a/libgojni.so app/src/main/jniLibs/armeabi-v7a
 
 gradle clean build

+ 1 - 1
AndroidLibrary/Dockerfile

@@ -15,7 +15,7 @@ RUN echo "debconf shared/accepted-oracle-license-v1-1 select true" | debconf-set
     libncurses5:i386 libstdc++6:i386 zlib1g:i386 && \
   add-apt-repository ppa:webupd8team/java && \
   apt-get update && \
-  apt-get -y install oracle-java6-installer
+  apt-get -y install oracle-java7-installer
 
 # Install Ant.
 RUN echo "INSTALLING ANT" && \