From c534645c01ed552e9b438d7eba7171537278a8fe Mon Sep 17 00:00:00 2001 From: Chris Double Date: Fri, 10 Aug 2012 20:15:16 +1200 Subject: [PATCH] Bug 759945 - Part 2: Android package changes for software decoding using libstagefright on Android - r=mark.finkle --HG-- extra : rebase_source : 3a96e6d81507329d52016f7dfb5d6b804c29f7d5 --- mobile/android/app/mobile.js | 3 +++ mobile/android/installer/package-manifest.in | 1 + 2 files changed, 4 insertions(+) diff --git a/mobile/android/app/mobile.js b/mobile/android/app/mobile.js index b95d36f15d5c..4c3f7667535c 100644 --- a/mobile/android/app/mobile.js +++ b/mobile/android/app/mobile.js @@ -689,5 +689,8 @@ pref("reader.color_scheme", "light"); // Used to show a first-launch tip in reader pref("reader.has_used_toolbar", false); +// Media plugins for libstagefright playback on android +pref("media.plugins.enabled", false); + // Coalesce touch events to prevent them from flooding the event queue pref("dom.event.touch.coalescing.enabled", true); diff --git a/mobile/android/installer/package-manifest.in b/mobile/android/installer/package-manifest.in index 067d59da51ef..14cbf6a3fa5c 100644 --- a/mobile/android/installer/package-manifest.in +++ b/mobile/android/installer/package-manifest.in @@ -41,6 +41,7 @@ @BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@ @BINPATH@/@DLL_PREFIX@mozalloc@DLL_SUFFIX@ @BINPATH@/@DLL_PREFIX@mozglue@DLL_SUFFIX@ +@BINPATH@/@DLL_PREFIX@omxplugin@DLL_SUFFIX@ @BINPATH@/@DLL_PREFIX@xul@DLL_SUFFIX@ @BINPATH@/@MOZ_CHILD_PROCESS_NAME@