From 5bfbcd62d8fe42a3ccc1034f20d0ddb72bda1b53 Mon Sep 17 00:00:00 2001 From: Boris Kraut Date: Wed, 3 Sep 2014 01:54:34 +0200 Subject: [PATCH] FBReader: Fix build. --- metadata/org.geometerplus.zlibrary.ui.android.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/metadata/org.geometerplus.zlibrary.ui.android.txt b/metadata/org.geometerplus.zlibrary.ui.android.txt index 131ae9be67..c9be84dc98 100644 --- a/metadata/org.geometerplus.zlibrary.ui.android.txt +++ b/metadata/org.geometerplus.zlibrary.ui.android.txt @@ -274,7 +274,7 @@ Build:2.0.6-gb,2000610 Build:2.0.6-ics,2000620 commit=b1dd70ff149560889e7548762046da4933e51e94 patch=fbreader-2.0.6.patch - srclibs=PDFParseLib@36d7479ce85638eb4f0ff9c875ec77680177da5d,ApacheHttpClient@4.2.5,NanoHttpd@Release-2.0.5,JsonSimple@tag_release_1_1_1 + srclibs=FBReaderJ@2.0.6,PDFParseLib@36d7479ce85638eb4f0ff9c875ec77680177da5d,ApacheHttpClient@4.2.5,NanoHttpd@Release-2.0.5,JsonSimple@tag_release_1_1_1 forceversion=yes rm=libs/*jar,obsolete/lib/*.jar prebuild=echo -e "sdk.dir=$$SDK$$\nndk.dir=$$NDK$$\n" >> local.properties && \ @@ -294,7 +294,7 @@ Build:2.0.6-ics,2000620 rm -fR src/com/paragon && \ sed -i -e '/com.google.android.gms.version/d' -e '/google_play_services/d' AndroidManifest.xml && \ sed -i -e '/google.services.lib.dir/d' project.properties && \ - pushd src/org/geometerplus/android/fbreader/network/auth && git checkout master -- *java + rm -fR src/org/geometerplus/android/fbreader/network/auth && cp -fR $$FBReaderJ$$/src/org/geometerplus/android/fbreader/network/auth src/org/geometerplus/android/fbreader/network/ update=third-party/AmbilWarna,third-party/android-filechooser/code,third-party/drag-sort-listview/library,. target=android-14 buildjni=yes @@ -303,7 +303,7 @@ Build:2.1-ics,2010020 disable=testing commit=33139e2b04ae36388956a57373ba74e8cc0ef23c patch=fbreader-2.0.6.patch - srclibs=PDFParseLib@36d7479ce85638eb4f0ff9c875ec77680177da5d,ApacheHttpClient@4.2.5,NanoHttpd@Release-2.0.5,JsonSimple@tag_release_1_1_1 + srclibs=FBReaderJ@2.1,PDFParseLib@36d7479ce85638eb4f0ff9c875ec77680177da5d,ApacheHttpClient@4.2.5,NanoHttpd@Release-2.0.5,JsonSimple@tag_release_1_1_1 forceversion=yes rm=libs/*jar,obsolete/lib/*.jar prebuild=echo -e "sdk.dir=$$SDK$$\nndk.dir=$$NDK$$\n" >> local.properties && \ @@ -323,7 +323,7 @@ Build:2.1-ics,2010020 rm -fR src/com/paragon && \ sed -i -e '/com.google.android.gms.version/d' -e '/google_play_services/d' AndroidManifest.xml && \ sed -i -e '/google.services.lib.dir/d' project.properties && \ - pushd src/org/geometerplus/android/fbreader/network/auth && git checkout master -- *java + rm -fR src/org/geometerplus/android/fbreader/network/auth && cp -fR $$FBReaderJ$$/src/org/geometerplus/android/fbreader/network/auth src/org/geometerplus/android/fbreader/network/ update=third-party/AmbilWarna,third-party/android-filechooser/code,third-party/drag-sort-listview/library,. target=android-14 buildjni=yes