From a1c3c7c30f063411309c402e6c4bf28da4a1549c Mon Sep 17 00:00:00 2001 From: David Black Date: Sat, 29 Jun 2013 14:48:08 +0100 Subject: [PATCH] just bundle armeabi and armeabi-v7a in com.artifex.mupdfdemo --- metadata/com.artifex.mupdfdemo.txt | 12 ++++-------- metadata/com.artifex.mupdfdemo/arm.patch | 22 ---------------------- 2 files changed, 4 insertions(+), 30 deletions(-) delete mode 100644 metadata/com.artifex.mupdfdemo/arm.patch diff --git a/metadata/com.artifex.mupdfdemo.txt b/metadata/com.artifex.mupdfdemo.txt index dec6f64fbb..9f09deb614 100644 --- a/metadata/com.artifex.mupdfdemo.txt +++ b/metadata/com.artifex.mupdfdemo.txt @@ -9,9 +9,8 @@ Summary:Lightweight document viewer Description: '''N.B''' The names of the versions correspond to the chip architectures that the apk is designed to run on. -This is the only PDF viewer we have that is designed for MIPS; we don't have -an ARMv7a apk for the moment due to limitations in our repo index, but ARM is -plenty fast. +This is the only PDF viewer we have that is designed for MIPS; the ARM apk +contains libraries for both ARM and ARMv7a. MuPDF supports PDF 1.7 with transparency, encryption, hyperlinks, annotations, searching and more. @@ -24,11 +23,8 @@ Repo:http://git.ghostscript.com/mupdf.git Build Version:1.2,2,1.2,subdir=android,submodules=yes,buildjni=yes,prebuild=\ cd .. && make generate && cd android -Build Version:1.2-ARM,49,0516026e,forceversion=yes,forcevercode=yes,\ -subdir=platform/android,submodules=yes,patch=arm.patch,prebuild=\ -cd ../.. && make generate,buildjni=yes -Build Version:1.2-ARMv7a,50,!no room in index for armv7 at 0516026e,\ -subdir=platform/android,submodules=yes,prebuild=\ +Build Version:1.2-ARM,50,0516026e,subdir=platform/android,submodules=yes,\ +prebuild=sed -i 's/armeabi-v7a/armeabi armeabi-v7a/g' jni/Application.mk && \ cd ../.. && make generate,buildjni=yes Build Version:1.2-x86,51,0516026e,forceversion=yes,forcevercode=yes,\ subdir=platform/android,submodules=yes,patch=x86.patch,prebuild=\ diff --git a/metadata/com.artifex.mupdfdemo/arm.patch b/metadata/com.artifex.mupdfdemo/arm.patch deleted file mode 100644 index b43eb2491a..0000000000 --- a/metadata/com.artifex.mupdfdemo/arm.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/platform/android/jni/Application.mk b/platform/android/jni/Application.mk -index 60909b6..a15f9f2 100644 ---- a/platform/android/jni/Application.mk -+++ b/platform/android/jni/Application.mk -@@ -3,13 +3,13 @@ - # Suppose our base version is X: - - # Version X: armeabi --#APP_PLATFORM=android-8 --#APP_ABI := armeabi -+APP_PLATFORM=android-8 -+APP_ABI := armeabi - - # Version X+1: armeabi-v7a (Much faster due to the availability of hardware - # FP, but cannot be run in the emulator). --APP_PLATFORM=android-8 --APP_ABI := armeabi-v7a -+#APP_PLATFORM=android-8 -+#APP_ABI := armeabi-v7a - - # Version X+2: x86 (Requires android-9, so a change needs to be made in - # AndroidManifest.xml too)