From 5ac32b4dced250d5dca426d07dce1c9e1627f1ca Mon Sep 17 00:00:00 2001 From: Boris Kraut Date: Fri, 6 May 2016 16:01:10 +0200 Subject: [PATCH] Ring: Fix build --- metadata/cx.ring.txt | 16 +++++++++------- srclibs/ringd.txt | 2 ++ 2 files changed, 11 insertions(+), 7 deletions(-) create mode 100644 srclibs/ringd.txt diff --git a/metadata/cx.ring.txt b/metadata/cx.ring.txt index 88a0680b02..657683ecb0 100644 --- a/metadata/cx.ring.txt +++ b/metadata/cx.ring.txt @@ -69,16 +69,18 @@ Build:20160315,34 popd Build:20160427,42 - disable=use srclib for daemon + disable=builds commit=00e089c75376e4c27536cb6a8e900b9a16466002 - subdir=ring-android/app/src/main - output=../../build/outputs/apk/app-universal-release-unsigned.apk - build=pushd ../../../../ && \ - echo -e '#!/bin/sh\ngradle "$@"' > ring-android/gradlew && \ + subdir=ring-android/app + output=build/outputs/apk/app-universal-release-unsigned.apk + srclibs=ringd@HEAD + build=sed -i -e "/MissingTranslation/adisable 'ExtraTranslation'\n" build.gradle && \ + export DAEMON_DIR=`readlink -f $$ringd$$` && \ + echo -e '#!/bin/sh\ngradle "$@"' > ../gradlew && \ export ANDROID_NDK_ROOT=$ANDROID_NDK && \ export ANDROID_ABI="armeabi-v7a" && \ - ./compile.sh release && \ - popd + cd ../../ && \ + ./compile.sh release Auto Update Mode:None Update Check Mode:RepoManifest diff --git a/srclibs/ringd.txt b/srclibs/ringd.txt new file mode 100644 index 0000000000..e27db9379e --- /dev/null +++ b/srclibs/ringd.txt @@ -0,0 +1,2 @@ +Repo Type:git +Repo:https://gerrit-ring.savoirfairelinux.com/ring-daemon