From 456b950c527da116e4132ed9e3e260419ac34ff0 Mon Sep 17 00:00:00 2001
From: Alyssa Milburn
Date: Sat, 22 Oct 2011 20:47:02 +0200
Subject: ANDROID: Add a shared user id.

Otherwise the plugins fail to run on modern Android because they're set
to run in-process but they're not allowed to do so.
---
 dists/android/AndroidManifest.xml    | 3 ++-
 dists/android/AndroidManifest.xml.in | 3 ++-
 dists/android/plugin-manifest.xml    | 3 ++-
 dists/android/plugin-manifest.xml.in | 3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'dists/android')

diff --git a/dists/android/AndroidManifest.xml b/dists/android/AndroidManifest.xml
index affce3c004..a25048fe28 100644
--- a/dists/android/AndroidManifest.xml
+++ b/dists/android/AndroidManifest.xml
@@ -5,7 +5,8 @@
 		package="org.inodes.gus.scummvm"
 		android:versionCode="@ANDROID_VERSIONCODE@"
 		android:versionName="1.5.0git"
-		android:installLocation="preferExternal">
+		android:installLocation="preferExternal"
+		android:sharedUserId="org.inodes.gus.scummvm">
 
 	<!-- This version works on Android 1.5 (SDK 3) and newer, but we
 			want Android 2.2 (SDK 8) defaults and features. -->
diff --git a/dists/android/AndroidManifest.xml.in b/dists/android/AndroidManifest.xml.in
index e9ab30a42b..32444a03f0 100644
--- a/dists/android/AndroidManifest.xml.in
+++ b/dists/android/AndroidManifest.xml.in
@@ -5,7 +5,8 @@
 		package="org.inodes.gus.scummvm"
 		android:versionCode="@ANDROID_VERSIONCODE@"
 		android:versionName="@VERSION@"
-		android:installLocation="preferExternal">
+		android:installLocation="preferExternal"
+		android:sharedUserId="org.inodes.gus.scummvm">
 
 	<!-- This version works on Android 1.5 (SDK 3) and newer, but we
 			want Android 2.2 (SDK 8) defaults and features. -->
diff --git a/dists/android/plugin-manifest.xml b/dists/android/plugin-manifest.xml
index adcd39f9aa..728beb1de3 100644
--- a/dists/android/plugin-manifest.xml
+++ b/dists/android/plugin-manifest.xml
@@ -4,7 +4,8 @@
 		package="org.inodes.gus.scummvm.plugin.@PLUGIN_NAME@"
 		android:versionCode="@PLUGIN_VERSION_CODE@"
 		android:versionName="1.5.0git"
-		android:installLocation="preferExternal">
+		android:installLocation="preferExternal"
+		android:sharedUserId="org.inodes.gus.scummvm">
 
 	<uses-sdk android:minSdkVersion="3" android:targetSdkVersion="8" />
 
diff --git a/dists/android/plugin-manifest.xml.in b/dists/android/plugin-manifest.xml.in
index 47db078c93..ab0a63a0cf 100644
--- a/dists/android/plugin-manifest.xml.in
+++ b/dists/android/plugin-manifest.xml.in
@@ -4,7 +4,8 @@
 		package="org.inodes.gus.scummvm.plugin.@PLUGIN_NAME@"
 		android:versionCode="@PLUGIN_VERSION_CODE@"
 		android:versionName="@VERSION@"
-		android:installLocation="preferExternal">
+		android:installLocation="preferExternal"
+		android:sharedUserId="org.inodes.gus.scummvm">
 
 	<uses-sdk android:minSdkVersion="3" android:targetSdkVersion="8" />
 
-- 
cgit v1.2.3