From b8778fc7c382ec401409bbaafcb67355f0c566e3 Mon Sep 17 00:00:00 2001
From: Angus Lees
Date: Mon, 5 Jul 2010 01:00:59 +0000
Subject: Switch Android toolchain prefix from arm-android-eabi to
 arm-*-linux-androideabi, since this is what the upcoming gcc-4.6 change uses.
 Work around Android 2.0 and newer dynamic linker bug by explicitly linking
 plugins against the core libscummvm.so. Mark Android packages as preferring
 to be on external storage. Move -lm from LDFLAGS to LIBS.

svn-id: r50665
---
 dists/android/AndroidManifest.xml    | 10 ++++------
 dists/android/AndroidManifest.xml.in | 12 +++++-------
 dists/android/mkmanifest.pl          |  1 +
 3 files changed, 10 insertions(+), 13 deletions(-)

(limited to 'dists/android')

diff --git a/dists/android/AndroidManifest.xml b/dists/android/AndroidManifest.xml
index 438703a3cc..55e3bf2f38 100644
--- a/dists/android/AndroidManifest.xml
+++ b/dists/android/AndroidManifest.xml
@@ -2,16 +2,14 @@
 <!-- NB: android:versionCode needs to be bumped for formal releases -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="org.inodes.gus.scummvm"
-      android:versionCode="6" android:versionName="1.2.0svn">
+      android:versionCode="6" android:versionName="1.2.0svn"
+      android:installLocation="preferExternal">
 
   <!-- This version is built against a cupcake (and newer?) ABI.
-       It works on Android 1.5 (SDK 3) and Android 1.6 (SDK 4).
-       Native libraries changed around in Android 2.0 (SDK 5) so we
-       don't work on that yet.
+       It works on Android 1.5 (SDK 3) and newer.
     -->
   <uses-sdk android:minSdkVersion="3"
-	    android:maxSdkVersion="4"
-	    android:targetSdkVersion="4" />
+	    android:targetSdkVersion="8" />
 
   <application android:name=".ScummVMApplication"
     android:label="@string/app_name"
diff --git a/dists/android/AndroidManifest.xml.in b/dists/android/AndroidManifest.xml.in
index ce0bef6f94..26a94f957b 100644
--- a/dists/android/AndroidManifest.xml.in
+++ b/dists/android/AndroidManifest.xml.in
@@ -2,16 +2,14 @@
 <!-- NB: android:versionCode needs to be bumped for formal releases -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="org.inodes.gus.scummvm"
-      android:versionCode="6" android:versionName="@VERSION@">
+      android:versionCode="6" android:versionName="@VERSION@"
+      android:installLocation="preferExternal">
 
-  <!-- This version is built against a cupcake (and newer?) ABI.
-       It works on Android 1.5 (SDK 3) and Android 1.6 (SDK 4).
-       Native libraries changed around in Android 2.0 (SDK 5) so we
-       don't work on that yet.
+  <!-- This version works on Android 1.5 (SDK 3) and newer, but we
+       want Android 2.2 (SDK 8) defaults and features.
     -->
   <uses-sdk android:minSdkVersion="3"
-	    android:maxSdkVersion="4"
-	    android:targetSdkVersion="4" />
+	    android:targetSdkVersion="8" />
 
   <application android:name=".ScummVMApplication"
     android:label="@string/app_name"
diff --git a/dists/android/mkmanifest.pl b/dists/android/mkmanifest.pl
index 00d15f561e..62caa64a55 100755
--- a/dists/android/mkmanifest.pl
+++ b/dists/android/mkmanifest.pl
@@ -105,6 +105,7 @@ sub print_manifest {
 	'package' => "org.inodes.gus.scummvm.plugin.$info->{name}",
 	[ANDROID, 'versionCode'] => $package_versionCode,
 	[ANDROID, 'versionName'] => $package_versionName,
+	[ANDROID, 'installLocation'] => 'preferExternal',
 	);
 
     $writer->startTag(
-- 
cgit v1.2.3