Remove other gonk widget conditionals and unused files.

Tag #288.

4 files changed, 22 insertions, 40 deletions

diff --git a/media/omx-plugin/lib/ics/libstagefright/moz.build b/media/omx-plugin/lib/ics/libstagefright/moz.build
index 1fe19a5fd..b156d151e 100644
--- a/media/omx-plugin/lib/ics/libstagefright/moz.build
+++ b/media/omx-plugin/lib/ics/libstagefright/moz.build
@@ -5,14 +5,13 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 DIST_INSTALL = False
 
-if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk':
-    SOURCES += [
-        'libstagefright.cpp',
-    ]
-    # Some codec-related code uses multi-character constants; allow this.
-    # XXX: could instead use the FOURCC macro to define these constants.
-    if CONFIG['GNU_CC'] or CONFIG['CLANG_CL']:
-        SOURCES['libstagefright.cpp'].flags += ['-Wno-error=multichar']
+SOURCES += [
+    'libstagefright.cpp',
+]
+# Some codec-related code uses multi-character constants; allow this.
+# XXX: could instead use the FOURCC macro to define these constants.
+if CONFIG['GNU_CC'] or CONFIG['CLANG_CL']:
+    SOURCES['libstagefright.cpp'].flags += ['-Wno-error=multichar']
 
 SharedLibrary('stagefright')
 
diff --git a/media/omx-plugin/lib/ics/libutils/moz.build b/media/omx-plugin/lib/ics/libutils/moz.build
index efce12194..7fa617fb3 100644
--- a/media/omx-plugin/lib/ics/libutils/moz.build
+++ b/media/omx-plugin/lib/ics/libutils/moz.build
@@ -5,10 +5,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 DIST_INSTALL = False
 
-if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk':
-    SOURCES += [
-        'libutils.cpp',
-    ]
+SOURCES += [
+    'libutils.cpp',
+]
 
 SharedLibrary('utils')
 
diff --git a/media/omx-plugin/lib/ics/libvideoeditorplayer/moz.build b/media/omx-plugin/lib/ics/libvideoeditorplayer/moz.build
index 4314b1aa2..f05f0f3c9 100644
--- a/media/omx-plugin/lib/ics/libvideoeditorplayer/moz.build
+++ b/media/omx-plugin/lib/ics/libvideoeditorplayer/moz.build
@@ -5,10 +5,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 DIST_INSTALL = False
 
-if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk':
-    SOURCES += [
-        'libvideoeditorplayer.cpp',
-    ]
+SOURCES += [
+    'libvideoeditorplayer.cpp',
+]
 
 SharedLibrary('videoeditorplayer')
 
diff --git a/media/omx-plugin/moz.build b/media/omx-plugin/moz.build
index 80b8534f2..004a8bdba 100644
--- a/media/omx-plugin/moz.build
+++ b/media/omx-plugin/moz.build
@@ -20,13 +20,10 @@ SOURCES += [
 
 SharedLibrary('omxplugin')
 
-if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
-    pass
-else:
-    LOCAL_INCLUDES += [
-        'include/ics',
-        'include/ics/media/stagefright/openmax',
-    ]
+LOCAL_INCLUDES += [
+    'include/ics',
+    'include/ics/media/stagefright/openmax',
+]
 
 if CONFIG['GNU_CXX']:
     # Stagefright header files define many multichar constants.
@@ -35,23 +32,11 @@ if CONFIG['GNU_CXX']:
         '-Wno-shadow',
     ]
 
-if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
-    EXTRA_DSO_LDOPTS += [
-        '-lutils',
-        '-lstagefright',
-        '-lmedia',
-        '-lstagefright_omx',
-        '-lbinder',
-        '-lui',
-        '-lhardware',
-        '-lcutils',
-    ]
-else:
-    USE_LIBS += [
-        '/media/omx-plugin/lib/ics/libstagefright/stagefright',
-        '/media/omx-plugin/lib/ics/libutils/utils',
-        'videoeditorplayer',
-    ]
+USE_LIBS += [
+    '/media/omx-plugin/lib/ics/libstagefright/stagefright',
+    '/media/omx-plugin/lib/ics/libutils/utils',
+    'videoeditorplayer',
+]
 
 # Don't use STL wrappers; this isn't Gecko code
 DISABLE_STL_WRAPPING = True