missytake/fdroiddata
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix one build error for the pep build

Browse source 
Fixes the "LOCAL_SRC_FILES points to a missing file" error caused by
the newer NDK version 12.

(the NDK sets APP_ABI to include arm64-v8a, for which it then expects
to have a libetpan build for, but libetpan hardcodes the list of targets)
This commit is contained in:
est31 2016-09-16 19:47:20 +02:00
parent 1b84283374
commit 7728449318
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
metadata/pep.android.k9.txt
View file

@ -103,12 +103,14 @@ Build:0.9.3,12
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:\(cd libetpan/build-android;\):\1 sed -i \''s/archs="armeabi/archs="armeabi arm64-v8a/\'' ./build.sh; :' $$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:/bin/sh:/bin/bash:" $$pEpEngine$$/build-android/build.sh && \
sed -i 's:\(archs="armeabi\):\1 arm64-v8a:' $$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