[spmc] non-launcher by default

koying · Mar 29, 2015 · 74e5949 · 74e5949
1 parent ba1c17a
commit 74e5949
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 12 deletions.
diff --git a/tools/android/packaging/Makefile.in b/tools/android/packaging/Makefile.in
@@ -72,10 +72,10 @@ apk-obb-unsigned: apk-clean sharedobb package
 apk-noobb: apk-clean package apk-sign
 
 launcher:
-	cd xbmc; patch -p5 < Manifest_launcher.patch
+	cd xbmc; patch -p0 < Manifest_launcher.patch
 
 nolauncher:
-	cd xbmc; patch -R -p5 < Manifest_launcher.patch
+	cd xbmc; patch -R -p0 < Manifest_launcher.patch
 
 xbmc/assets:
 	mkdir -p xbmc/assets

diff --git a/tools/android/packaging/xbmc/AndroidManifest.xml.in b/tools/android/packaging/xbmc/AndroidManifest.xml.in
@@ -38,9 +38,6 @@
                 <category android:name="android.intent.category.LAUNCHER" />
                 <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
                 <category android:name="tv.ouya.intent.category.APP"/>
-                <category android:name="android.intent.category.HOME" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.MONKEY" />
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />

diff --git a/tools/android/packaging/xbmc/Manifest_launcher.patch b/tools/android/packaging/xbmc/Manifest_launcher.patch
@@ -1,14 +1,12 @@
-diff --git a/tools/android/packaging/xbmc/AndroidManifest.xml b/tools/android/packaging/xbmc/AndroidManifest.xml
-index 30b9bbd..f59bd8d 100644
---- a/tools/android/packaging/xbmc/AndroidManifest.xml
-+++ b/tools/android/packaging/xbmc/AndroidManifest.xml
-@@ -29,6 +29,9 @@
-                 <action android:name="android.intent.action.MAIN" />
+--- AndroidManifest.xml	2015-03-29 18:06:49.169421692 +0200
++++ AndroidManifest.xml	2015-03-29 18:06:54.773421768 +0200
+@@ -38,6 +38,9 @@
                  <category android:name="android.intent.category.LAUNCHER" />
+                 <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
                  <category android:name="tv.ouya.intent.category.APP"/>
 +                <category android:name="android.intent.category.HOME" />
 +                <category android:name="android.intent.category.DEFAULT" />
 +                <category android:name="android.intent.category.MONKEY" />
-                 <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
              </intent-filter>
              <intent-filter>
+                 <action android:name="android.intent.action.VIEW" />