From b5c3813e544afe92768b36c14fd1976ddc8bc6d1 Mon Sep 17 00:00:00 2001
From: Robin Watts <robin.watts@artifex.com>
Date: Tue, 28 May 2013 15:44:37 +0100
Subject: Android manifest tweaks.

Make it easier to do release builds.
---
 android/AndroidManifest.xml    |  3 +--
 android/jni/Application.mk     | 26 ++++++++++++++++++++------
 android/res/values/strings.xml |  2 +-
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 631028e5..040663e4 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	package="com.artifex.mupdfdemo"
-	android:versionCode="2"
+	android:versionCode="50"
 	android:versionName="@string/version"
 	android:installLocation="auto">
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
@@ -15,7 +15,6 @@
 	<application
 		android:label="@string/app_name"
 		android:icon="@drawable/icon"
-		android:debuggable="true"
 		android:hardwareAccelerated="true">
 		<activity
 			android:name="ChoosePDFActivity"
diff --git a/android/jni/Application.mk b/android/jni/Application.mk
index 2b2f67c0..8eb9c3b9 100644
--- a/android/jni/Application.mk
+++ b/android/jni/Application.mk
@@ -1,11 +1,25 @@
-# The ARMv7 is significanly faster due to the use of the hardware FPU
+# When we build for google play, we build 4 different apk's, each with
+# a different version, by uncommenting one of the pairs of lines below.
+# Suppose our base version is X:
+
+# Version X: 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
+
+# Version X+2: x86 (Requires android-9, so a change needs to be made in
+# AndroidManifest.xml too)
+#APP_PLATFORM=android-9
+#APP_ABI := x86
 
-# We only build for arm variants by default. If you want more, uncomment
-# the appropriate line below.
-APP_ABI := armeabi armeabi-v7a
-#APP_ABI := armeabi armeabi-v7a x86 mips
-#APP_ABI := all
+# Version X+3: mips (Requires android-9, so a change needs to be made in
+# AndroidManifest.xml too)
+#APP_PLATFORM=android-9
+#APP_ABI := mips
 
 ifdef NDK_PROFILER
 # The profiler doesn't seem to receive ticks when run on release code.
diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml
index 65827b23..2928db14 100644
--- a/android/res/values/strings.xml
+++ b/android/res/values/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 	<string name="app_name">MuPDF</string>
-	<string name="version">1.2</string>
+	<string name="version">1.2 (Build 50/armv7a)</string>
 	<string name="no_media_warning">Storage media not present</string>
 	<string name="no_media_hint">Sharing the storage media with a PC can make it inaccessible</string>
 	<string name="cancel">Cancel</string>
-- 
cgit v1.2.3