Bug 852814 - Move the last remaining EXTRA_DSO_LDOPTS to moz.build. r=gps

media/omx-plugin/Makefile.in

@@ -1,22 +0,0 @@
-# Copyright 2012 Mozilla Foundation and Mozilla contributors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-include $(topsrcdir)/config/rules.mk
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),gonk)
-EXTRA_DSO_LDOPTS += \
-               -lutils -lstagefright -lmedia -lstagefright_omx -lbinder -lui \
-               -lhardware -lcutils \
-		$(NULL)
-endif

media/omx-plugin/moz.build

@@ -47,6 +47,16 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
              'hardware/libhardware/include',
          ]
     ]
+    EXTRA_DSO_LDOPTS += [
+        '-lutils',
+        '-lstagefright',
+        '-lmedia',
+        '-lstagefright_omx',
+        '-lbinder',
+        '-lui',
+        '-lhardware',
+        '-lcutils',
+    ]
 else:
     USE_LIBS += [
         '/media/omx-plugin/lib/ics/libstagefright/stagefright',