From 99fc51e728da01ef611deb6ed5e1f34da95d0ea6 Mon Sep 17 00:00:00 2001 From: est31 Date: Sat, 1 Oct 2016 18:08:11 +0200 Subject: [PATCH] pep: update srclibs and small reorder of prebuild script --- metadata/pep.android.k9.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/metadata/pep.android.k9.txt b/metadata/pep.android.k9.txt index d3efaa8907..27feb4433b 100644 --- a/metadata/pep.android.k9.txt +++ b/metadata/pep.android.k9.txt @@ -118,15 +118,15 @@ Build:0.9.4,13 commit=v0.9.4 subdir=k9mail gradle=fDroid - srclibs=pEpJNIAdapter@7fcaa04,pEpEngine@45b9d4a,yml2@8859102a + srclibs=pEpJNIAdapter@eebf37b8d,pEpEngine@1091a67dd74,yml2@8859102a prebuild=sed -i 's:file("../pEpJNIAdapter/android"):file("../srclib/pEpJNIAdapter/android"):' ../settings.gradle && \ sed -i "s/4.8/4.9/" $$pEpJNIAdapter$$/android/external/Makefile && \ sed -i 's:include $(ANDROID_NDK_HOME)/\(toolchains/$(NDK_TOOLCHAIN)/setup.mk\):include $(ANDROID_NDK_HOME)/build/core/\1:' $$pEpJNIAdapter$$/android/external/Makefile && \ sed -i 's:\(ICONV_PREFIX=$(LOCAL)\) \(./build.sh\):\1 bash \2:' $$pEpJNIAdapter$$/android/external/Makefile && \ sed -i "s:yml2proc:../$$yml2$$/yml2proc:" $$pEpJNIAdapter$$/src/Makefile && \ - sed -i 's:YML2PROC=.*$:YML2PROC=src/$$yml2$$/yml2proc:;s:YML_PATH=.*$:YML_PATH=src/$$yml2$$:' $$pEpEngine$$/Makefile.conf && \ sed -i 's:env python:env python2:' $$yml2$$/yml2proc && \ sed -i "s:backend.includePath.extend(dirs):backend.includePath.extend(['$(realpath $$yml2$$)']):" $$yml2$$/yml2proc && \ + sed -i 's:YML2PROC=.*$:YML2PROC=src/$$yml2$$/yml2proc:;s:YML_PATH=.*$:YML_PATH=src/$$yml2$$:' $$pEpEngine$$/Makefile.conf && \ sed -i "s:/bin/sh:/bin/bash:" $$pEpEngine$$/build-android/build.sh && \ sed -i 's:ASN1C_INCLUDE=.*$:ASN1C_INCLUDE=/usr/share/asn1c:' $$pEpEngine$$/Makefile.conf && \ sed -i 's:-fcompound-names:-fcompound-names -fnative-types:' $$pEpEngine$$/asn.1/Makefile