From 59934881a1dc27e0c6030d2133ec3f9aae583df7 Mon Sep 17 00:00:00 2001
From: Joel Teichroeb
Date: Mon, 5 Jan 2015 20:14:17 -0800
Subject: ANDROID: Remove unpacker and fix support for non arm

---
 dists/android/AndroidManifest.xml       | 19 +-----------------
 dists/android/AndroidManifest.xml.in    | 19 +-----------------
 dists/android/jni/Android.mk            |  2 +-
 dists/android/mkplugin.sh               | 16 ---------------
 dists/android/plugin-manifest.xml       | 35 ---------------------------------
 dists/android/plugin-manifest.xml.in    | 35 ---------------------------------
 dists/android/plugin-strings.xml        |  6 ------
 dists/android/res/drawable/gradient.xml |  7 -------
 dists/android/res/layout/splash.xml     | 19 ------------------
 9 files changed, 3 insertions(+), 155 deletions(-)
 delete mode 100755 dists/android/mkplugin.sh
 delete mode 100644 dists/android/plugin-manifest.xml
 delete mode 100644 dists/android/plugin-manifest.xml.in
 delete mode 100644 dists/android/plugin-strings.xml
 delete mode 100644 dists/android/res/drawable/gradient.xml
 delete mode 100644 dists/android/res/layout/splash.xml

(limited to 'dists')

diff --git a/dists/android/AndroidManifest.xml b/dists/android/AndroidManifest.xml
index db8a9adc54..ba1046e85c 100644
--- a/dists/android/AndroidManifest.xml
+++ b/dists/android/AndroidManifest.xml
@@ -5,7 +5,6 @@
 		package="org.scummvm.scummvm"
 		android:versionCode="@ANDROID_VERSIONCODE@"
 		android:versionName="1.8.0git"
-		android:installLocation="preferExternal"
 		android:sharedUserId="org.scummvm.scummvm">
 
 	<!-- This version works on Android 1.5 (SDK 3) and newer, but we
@@ -13,7 +12,7 @@
 	<uses-sdk android:minSdkVersion="3"
 			android:targetSdkVersion="8"/>
 
-	<application android:name=".ScummVMApplication"
+	<application
 			android:label="@string/app_name"
 			android:description="@string/app_desc"
 			android:icon="@drawable/scummvm">
@@ -22,17 +21,6 @@
 				android:screenOrientation="landscape"
 				android:configChanges="orientation|keyboardHidden"
 				android:windowSoftInputMode="adjustResize">
-			<intent-filter>
-				<action android:name="android.intent.action.MAIN"/>
-			</intent-filter>
-		</activity>
-
-		<activity android:name=".Unpacker"
-				android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
-				android:screenOrientation="landscape"
-				android:configChanges="orientation|keyboardHidden">
-			<meta-data android:name="org.scummvm.unpacker.nextActivity"
-				android:value="org.scummvm.scummvm/.ScummVMActivity"/>
 			<intent-filter>
 				<action android:name="android.intent.action.MAIN"/>
 				<category android:name="android.intent.category.LAUNCHER"/>
@@ -41,11 +29,6 @@
 		</activity>
 	</application>
 
-	<permission android:name="org.scummvm.scummvm.permission.SCUMMVM_PLUGIN"
-		android:label="@string/scummvm_perm_plugin_label"
-		android:description="@string/scummvm_perm_plugin_desc"
-		android:protectionLevel="signature"/>
-
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
 
 	<!-- Always needs some sort of qwerty keyboard.
diff --git a/dists/android/AndroidManifest.xml.in b/dists/android/AndroidManifest.xml.in
index bf45ffcc0e..d90e282e3d 100644
--- a/dists/android/AndroidManifest.xml.in
+++ b/dists/android/AndroidManifest.xml.in
@@ -5,7 +5,6 @@
 		package="org.scummvm.scummvm"
 		android:versionCode="@ANDROID_VERSIONCODE@"
 		android:versionName="@VERSION@"
-		android:installLocation="preferExternal"
 		android:sharedUserId="org.scummvm.scummvm">
 
 	<!-- This version works on Android 1.5 (SDK 3) and newer, but we
@@ -13,7 +12,7 @@
 	<uses-sdk android:minSdkVersion="3"
 			android:targetSdkVersion="8"/>
 
-	<application android:name=".ScummVMApplication"
+	<application
 			android:label="@string/app_name"
 			android:description="@string/app_desc"
 			android:icon="@drawable/scummvm">
@@ -22,17 +21,6 @@
 				android:screenOrientation="landscape"
 				android:configChanges="orientation|keyboardHidden"
 				android:windowSoftInputMode="adjustResize">
-			<intent-filter>
-				<action android:name="android.intent.action.MAIN"/>
-			</intent-filter>
-		</activity>
-
-		<activity android:name=".Unpacker"
-				android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
-				android:screenOrientation="landscape"
-				android:configChanges="orientation|keyboardHidden">
-			<meta-data android:name="org.scummvm.unpacker.nextActivity"
-				android:value="org.scummvm.scummvm/.ScummVMActivity"/>
 			<intent-filter>
 				<action android:name="android.intent.action.MAIN"/>
 				<category android:name="android.intent.category.LAUNCHER"/>
@@ -41,11 +29,6 @@
 		</activity>
 	</application>
 
-	<permission android:name="org.scummvm.scummvm.permission.SCUMMVM_PLUGIN"
-		android:label="@string/scummvm_perm_plugin_label"
-		android:description="@string/scummvm_perm_plugin_desc"
-		android:protectionLevel="signature"/>
-
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
 
 	<!-- Always needs some sort of qwerty keyboard.
diff --git a/dists/android/jni/Android.mk b/dists/android/jni/Android.mk
index d5b398412f..0b3ee4d22e 100644
--- a/dists/android/jni/Android.mk
+++ b/dists/android/jni/Android.mk
@@ -2,7 +2,7 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 
-APP_ABI := armeabi
+APP_ABI := $(ABI)
 LOCAL_MODULE := scummvm
 LOCAL_SRC_FILES := ../libscummvm.so
 
diff --git a/dists/android/mkplugin.sh b/dists/android/mkplugin.sh
deleted file mode 100755
index 30a7ef66d6..0000000000
--- a/dists/android/mkplugin.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-if [ $# -ne 5 ]; then
-	echo "usage: $0 configure plugin template versioncode target"
-	exit 1
-fi
-
-CONFIGURE=$1
-PLUGIN_NAME=$2
-TEMPLATE=$3
-PLUGIN_VERSION_CODE=$4
-TARGET=$5
-
-PLUGIN_DESC=`sed -n "s/add_engine\s$PLUGIN_NAME\s\"\(.\+\)\"\s.*/\1/p" < $CONFIGURE`
-
-sed "s|@PLUGIN_NAME@|$PLUGIN_NAME|;s|@PLUGIN_VERSION_CODE@|$PLUGIN_VERSION_CODE|;s|@PLUGIN_DESC@|$PLUGIN_DESC|" < $TEMPLATE > $TARGET
diff --git a/dists/android/plugin-manifest.xml b/dists/android/plugin-manifest.xml
deleted file mode 100644
index 040d1ea57c..0000000000
--- a/dists/android/plugin-manifest.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-		package="org.scummvm.scummvm.plugin.@PLUGIN_NAME@"
-		android:versionCode="@PLUGIN_VERSION_CODE@"
-		android:versionName="1.8.0git"
-		android:installLocation="preferExternal"
-		android:sharedUserId="org.scummvm.scummvm">
-
-	<uses-sdk android:minSdkVersion="3" android:targetSdkVersion="8" />
-
-	<application android:label="@string/app_name"
-			android:description="@string/app_desc"
-			android:icon="@drawable/scummvm">
-		<receiver android:name="org.scummvm.scummvm.PluginProvider"
-				android:process="org.scummvm.scummvm">
-			<intent-filter>
-				<action android:name="org.scummvm.scummvm.action.PLUGIN_QUERY"/>
-				<category android:name="android.intent.category.INFO"/>
-			</intent-filter>
-			<meta-data android:name="org.scummvm.scummvm.meta.UNPACK_LIB"
-					android:value="mylib/armeabi/lib@PLUGIN_NAME@.so" />
-		</receiver>
-	</application>
-
-	<uses-permission android:name="org.scummvm.scummvm.permission.SCUMMVM_PLUGIN"/>
-	<uses-configuration android:reqFiveWayNav="true"
-			android:reqKeyboardType="qwerty"/>
-
-	<uses-configuration android:reqTouchScreen="finger"
-			android:reqKeyboardType="qwerty"/>
-
-	<uses-configuration android:reqTouchScreen="stylus"
-			android:reqKeyboardType="qwerty"/>
-</manifest>
diff --git a/dists/android/plugin-manifest.xml.in b/dists/android/plugin-manifest.xml.in
deleted file mode 100644
index 4b429097ae..0000000000
--- a/dists/android/plugin-manifest.xml.in
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-		package="org.scummvm.scummvm.plugin.@PLUGIN_NAME@"
-		android:versionCode="@PLUGIN_VERSION_CODE@"
-		android:versionName="@VERSION@"
-		android:installLocation="preferExternal"
-		android:sharedUserId="org.scummvm.scummvm">
-
-	<uses-sdk android:minSdkVersion="3" android:targetSdkVersion="8" />
-
-	<application android:label="@string/app_name"
-			android:description="@string/app_desc"
-			android:icon="@drawable/scummvm">
-		<receiver android:name="org.scummvm.scummvm.PluginProvider"
-				android:process="org.scummvm.scummvm">
-			<intent-filter>
-				<action android:name="org.scummvm.scummvm.action.PLUGIN_QUERY"/>
-				<category android:name="android.intent.category.INFO"/>
-			</intent-filter>
-			<meta-data android:name="org.scummvm.scummvm.meta.UNPACK_LIB"
-					android:value="mylib/armeabi/lib@PLUGIN_NAME@.so" />
-		</receiver>
-	</application>
-
-	<uses-permission android:name="org.scummvm.scummvm.permission.SCUMMVM_PLUGIN"/>
-	<uses-configuration android:reqFiveWayNav="true"
-			android:reqKeyboardType="qwerty"/>
-
-	<uses-configuration android:reqTouchScreen="finger"
-			android:reqKeyboardType="qwerty"/>
-
-	<uses-configuration android:reqTouchScreen="stylus"
-			android:reqKeyboardType="qwerty"/>
-</manifest>
diff --git a/dists/android/plugin-strings.xml b/dists/android/plugin-strings.xml
deleted file mode 100644
index ade37e0aca..0000000000
--- a/dists/android/plugin-strings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<resources>
-	<string name="app_name">ScummVM plugin: "@PLUGIN_NAME@"</string>
-	<string name="app_desc">Game engine for: @PLUGIN_DESC@</string>
-</resources>
diff --git a/dists/android/res/drawable/gradient.xml b/dists/android/res/drawable/gradient.xml
deleted file mode 100644
index dbfd9b5b34..0000000000
--- a/dists/android/res/drawable/gradient.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <gradient
-      android:startColor="#e9bb8b"
-      android:endColor="#d16e09"
-      android:angle="315" />
-</shape>
diff --git a/dists/android/res/layout/splash.xml b/dists/android/res/layout/splash.xml
deleted file mode 100644
index e9fd5f70e7..0000000000
--- a/dists/android/res/layout/splash.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  android:orientation="vertical"
-  android:gravity="center"
-  android:background="@drawable/gradient"
-  android:layout_width="fill_parent"
-  android:layout_height="fill_parent">
-  <ImageView
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:adjustViewBounds="true"
-    android:scaleType="fitCenter"
-    android:src="@drawable/scummvm_big" />
-  <ProgressBar android:id="@+id/progress"
-    style="?android:attr/progressBarStyleHorizontal"
-    android:layout_width="300dip"
-    android:layout_height="wrap_content"
-    android:padding="20dip"/>
-</LinearLayout>
-- 
cgit v1.2.3