From 48d912684176df7136a9d2879e3487aaceececb8 Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Sun, 22 Apr 2018 22:57:32 +0200 Subject: [PATCH] ring: add v116 --- metadata/cx.ring.txt | 17 ++++++++++++ .../0001-gradle-remove-unneeded-repo.patch | 27 +++++++++++++++++++ 2 files changed, 44 insertions(+) create mode 100644 metadata/cx.ring/0001-gradle-remove-unneeded-repo.patch diff --git a/metadata/cx.ring.txt b/metadata/cx.ring.txt index 4df8de20bb..2e01e12dee 100644 --- a/metadata/cx.ring.txt +++ b/metadata/cx.ring.txt @@ -545,6 +545,23 @@ Build:20180201,102 ./compile.sh release ndk=r15c +Build:20180421,116 + commit=8ce06c1bc2ee0837281f6d05fe97393d2a351a59 + subdir=client-android/ring-android/app + submodules=yes + sudo=apt-get update && \ + apt-get install --yes -t jessie-backports swig + patch=0001-gradle-remove-unneeded-repo.patch + gradle=noPush + prebuild=$ANDROID_HOME/tools/bin/sdkmanager 'platforms;android-27' && \ + sed -i -e '/$DAEMON_ONLY/,+7d' ../../compile.sh + scandelete=client-windows,client-uwp + build=export ANDROID_NDK_ROOT=$ANDROID_NDK && \ + export ANDROID_ABI="armeabi-v7a arm64-v8a x86" && \ + cd ../../ && \ + ./compile.sh release + ndk=r16b + Maintainer Notes: Ring has a lot of native dependencies, the source tarballs of these are all downloaded and build for all enabled architectures. We provide a fake gradlew because compile.sh calls this in the end. diff --git a/metadata/cx.ring/0001-gradle-remove-unneeded-repo.patch b/metadata/cx.ring/0001-gradle-remove-unneeded-repo.patch new file mode 100644 index 0000000000..4a8875ce24 --- /dev/null +++ b/metadata/cx.ring/0001-gradle-remove-unneeded-repo.patch @@ -0,0 +1,27 @@ +From 2501598e8d23cefc3c61cd0bfc94a2f2be82c831 Mon Sep 17 00:00:00 2001 +From: Marcus Hoffmann +Date: Sun, 22 Apr 2018 20:53:03 +0200 +Subject: [PATCH] gradle: remove unneeded repo + +Change-Id: I88710352d8fb70d50d91f830247f82c7eec0f496 +--- + client-android/ring-android/build.gradle | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/client-android/ring-android/build.gradle b/client/android/ring-android/build.gradle +index dcda861c..92a8ff11 100644 +--- a/client-android/ring-android/build.gradle ++++ b/client-android/ring-android/build.gradle +@@ -2,9 +2,6 @@ buildscript { + repositories { + jcenter() + google() +- maven { +- url 'https://dl.bintray.com/poldz123/maven/' +- } + } + dependencies { + classpath 'com.android.tools.build:gradle:3.1.1' +-- +2.14.1 +