diff options
| author | Leith Bade <leith@leithalweapon.geek.nz> | 2014-11-06 00:51:08 +1100 |
|---|---|---|
| committer | Leith Bade <leith@leithalweapon.geek.nz> | 2014-11-06 00:51:08 +1100 |
| commit | 18d5501279e17f5f93c4c450586f1c3ad29be316 (patch) | |
| tree | 2b4b89373b9382ce5288b0549fc5c324b6710532 | |
| parent | bff63d44c62cea75e2e5162e7c46cd1fbf8ef4c1 (diff) | |
| download | qtlocation-mapboxgl-18d5501279e17f5f93c4c450586f1c3ad29be316.tar.gz | |
Add java to build
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rw-r--r-- | Makefile | 8 | ||||
| -rwxr-xr-x | scripts/travis_before_install.sh | 12 |
3 files changed, 18 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 952405ea04..f76c9f0c03 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,6 +29,7 @@ before_install: - source ./scripts/travis_helper.sh - source ./scripts/flags.sh - export ANDROID_NDK_PATH="$(pwd)/android-ndk-r10c" +- export JAVA_HOME="$(pwd)/jdk1.7.0_71" - ./scripts/travis_before_install.sh - if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then export LD_LIBRARY_PATH=`mason prefix mesa 10.3.1`/lib; fi - if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then glxinfo; fi @@ -82,7 +82,11 @@ android: export PATH="`MASON_DIR=./.mason MASON_PLATFORM=android ./.mason/mason env PATH`:${PATH}" && \ MASON_PLATFORM=android ./configure config-android.gypi && \ deps/run_gyp android/mapboxgl-app.gyp -Iconfig-android.gypi -Dplatform=android --depth=. --generator-output=./build/android -f make-android && \ - $(MAKE) -C build/android BUILDTYPE=$(BUILDTYPE) V=$(V) androidapp + $(MAKE) -C build/android BUILDTYPE=$(BUILDTYPE) V=$(V) androidapp && \ + mkdir -p android/java/lib/src/main/jniLibs/armeabi-v7a && \ + cp build/android/out/$(BUILDTYPE)/lib.target/libmapbox-gl.so android/java/lib/src/main/jniLibs/armeabi-v7a/libmapbox-gl.so && \ + cd android/java && \ + ./gradlew build ##### Test cases ############################################################### @@ -147,6 +151,8 @@ clean: clear_xcode_cache -rm -rf ./build/ -rm -rf ./macosx/build/ -rm -rf ./config.gypi ./config-ios.gypi ./config-android.gypi + -rm -rf ./android/java/build ./android/java/app/build ./android/java/lib/build + -rm -rf ./android/java/lib/src/main/jniLibs distclean: clean -rm -rf ./mason_packages diff --git a/scripts/travis_before_install.sh b/scripts/travis_before_install.sh index 962a6901dd..09818ee7a0 100755 --- a/scripts/travis_before_install.sh +++ b/scripts/travis_before_install.sh @@ -4,8 +4,8 @@ set -o pipefail if [[ "${MASON_PLATFORM}" == "android" ]]; then - echo "debug: unpacking" - #mapbox_time "unpacking NDK" \ + echo "debug: installing 7z" + #mapbox_time "installing 7z" \ MASON_PLATFORM= ./.mason/mason install 7z 9.20 echo "debug: setting 7z path" @@ -22,6 +22,14 @@ if [[ "${MASON_PLATFORM}" == "android" ]]; then #mapbox_time "unpacking NDK" \ $SEVEN_ZIP_PATH x ./android-ndk-r10c-linux-x86_64.bin > .tmp-ndk-log rm .tmp-ndk-log + + echo "debug: fetching JDK" + #mapbox_time "fetching JDK" \ + wget --no-cookies --no-check-certificate --header "Cookie: gpw_e24=http%3A%2F%2Fwww.oracle.com%2F; oraclelicense=accept-securebackup-cookie" http://download.oracle.com/otn-pub/java/jdk/7u71-b14/jdk-7u71-linux-x64.tar.gz + + echo "debug: unpacking JDK" + #mapbox_time "unpacking JDK" \ + tar -xzf ./jdk-7u71-linux-x64.tar.gz fi if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then |