Revert "Implement method stubs for OpenMAX IL instead of relying on -lOmxCore."

Review URL: http://codereview.chromium.org/431040


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32993 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 9 insertions, 79 deletions

diff --git a/third_party/openmax/omx_stub.cc b/third_party/openmax/omx_stub.cc
deleted file mode 100644
index a2a7526..0000000
--- a/third_party/openmax/omx_stub.cc
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Satisfies linker dependencies for targets requiring an OpenMAX Core library.
-// Not intended in any way to be functional!!
-
-#include <OMX_Core.h>
-
-#define NOTIMPLEMENTED_POLICY 3  // Fail at runtime via DCHECK.
-#include "base/logging.h"
-
-extern "C" {
-
-OMX_API OMX_ERRORTYPE OMX_Init() {
-  NOTIMPLEMENTED();
-  return OMX_ErrorNotImplemented;
-}
-
-OMX_API OMX_ERRORTYPE OMX_Deinit() {
-  NOTIMPLEMENTED();
-  return OMX_ErrorNotImplemented;
-}
-
-OMX_API OMX_ERRORTYPE OMX_GetHandle(OMX_HANDLETYPE*, OMX_STRING, OMX_PTR,
-                                    OMX_CALLBACKTYPE*) {
-  NOTIMPLEMENTED();
-  return OMX_ErrorNotImplemented;
-}
-
-OMX_API OMX_ERRORTYPE OMX_FreeHandle(OMX_HANDLETYPE) {
-  NOTIMPLEMENTED();
-  return OMX_ErrorNotImplemented;
-};
-
-}  // extern "C"
diff --git a/third_party/openmax/openmax.gyp b/third_party/openmax/openmax.gyp
index 53929ba..aeca369 100644
--- a/third_party/openmax/openmax.gyp
+++ b/third_party/openmax/openmax.gyp
@@ -3,46 +3,11 @@
 # found in the LICENSE file.
 
 {
-  'variables': {
-    'use_system_openmax%': 0,
-  },
-  'target_defaults': {
-    'conditions': [
-      ['use_system_openmax==0', {
-        'type': '<(library)',
-        'dependencies': [
-          '../../base/base.gyp:base',
-        ],
-        'sources': [
-          'omx_stub.cc',
-        ],
-        'include_dirs': [
-          'il',
-        ],
-        'defines': [
-          '__OMX_EXPORTS',
-        ],
-        'direct_dependent_settings': {
-          'defines': [
-            '__OMX_EXPORTS',
-          ],
-        },
-      },{
-        'type': 'none',
-        'direct_dependent_settings': {
-          'link_settings': {
-            'libraries': [
-              '-lOmxCore',
-            ],
-          },
-        },
-      }],
-    ],
-  },
   'targets': [
     {
       # OpenMAX IL level of API.
       'target_name': 'il',
+      'type': 'none',
       'sources': [
         'il/OMX_Audio.h',
         'il/OMX_Component.h',
@@ -59,13 +24,14 @@
         'include_dirs': [
           'il',
         ],
+        'link_settings': {
+          'libraries': [
+            '-lOmxCore',
+            # We need dl for dlopen() and friends.
+            '-ldl',
+          ],
+        },
       },
     },
-  ],
+ ],
 }
-
-# Local Variables:
-# tab-width:2
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=2 shiftwidth=2: