Commit e4dea9da authored by Xiaohan Wang's avatar Xiaohan Wang Committed by Commit Bot

media: Use base component_export.h for media

Since COMPONENT_EXPORT(MEDIA) is too long, still keep MEDIA_EXPORT. But
instead of defining our own, define it to be COMPONENT_EXPORT(MEDIA).

Bug: None
Change-Id: I0b24844d3227f918ef1d567a405a03356f66d289
Reviewed-on: https://chromium-review.googlesource.com/c/1313879
Commit-Queue: Xiaohan Wang <xhwang@chromium.org>
Reviewed-by: default avatarDale Curtis <dalecurtis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#605190}
parent 768f4c6e
...@@ -77,7 +77,7 @@ config("subcomponent_config") { ...@@ -77,7 +77,7 @@ config("subcomponent_config") {
if (is_mac) { if (is_mac) {
visibility += [ "//media/base/mac" ] visibility += [ "//media/base/mac" ]
} }
defines = [ "MEDIA_IMPLEMENTATION" ] defines = [ "IS_MEDIA_IMPL" ]
configs = [ configs = [
":media_config", ":media_config",
"//build/config/compiler:wexit_time_destructors", "//build/config/compiler:wexit_time_destructors",
......
...@@ -25,7 +25,7 @@ class MediaDrmBridgeDelegate; ...@@ -25,7 +25,7 @@ class MediaDrmBridgeDelegate;
// media playback could occur. // media playback could occur.
MEDIA_EXPORT void SetMediaDrmBridgeClient(MediaDrmBridgeClient* media_client); MEDIA_EXPORT void SetMediaDrmBridgeClient(MediaDrmBridgeClient* media_client);
#if defined(MEDIA_IMPLEMENTATION) #if defined(IS_MEDIA_IMPL)
// Getter for the client. Returns nullptr if no customized client is needed. // Getter for the client. Returns nullptr if no customized client is needed.
MediaDrmBridgeClient* GetMediaDrmBridgeClient(); MediaDrmBridgeClient* GetMediaDrmBridgeClient();
#endif #endif
......
...@@ -27,7 +27,7 @@ class MediaClient; ...@@ -27,7 +27,7 @@ class MediaClient;
MEDIA_EXPORT void SetMediaClient(MediaClient* media_client); MEDIA_EXPORT void SetMediaClient(MediaClient* media_client);
// Media's embedder API should only be used by media. // Media's embedder API should only be used by media.
#if defined(MEDIA_IMPLEMENTATION) || defined(MEDIA_BLINK_IMPLEMENTATION) #if defined(IS_MEDIA_IMPL) || defined(MEDIA_BLINK_IMPLEMENTATION)
// Getter for the client. Returns NULL if no customized client is needed. // Getter for the client. Returns NULL if no customized client is needed.
MEDIA_EXPORT MediaClient* GetMediaClient(); MEDIA_EXPORT MediaClient* GetMediaClient();
#endif #endif
......
...@@ -5,28 +5,8 @@ ...@@ -5,28 +5,8 @@
#ifndef MEDIA_BASE_MEDIA_EXPORT_H_ #ifndef MEDIA_BASE_MEDIA_EXPORT_H_
#define MEDIA_BASE_MEDIA_EXPORT_H_ #define MEDIA_BASE_MEDIA_EXPORT_H_
// Define MEDIA_EXPORT so that functionality implemented by the Media module #include "base/component_export.h"
// can be exported to consumers.
#if defined(COMPONENT_BUILD) #define MEDIA_EXPORT COMPONENT_EXPORT(MEDIA)
#if defined(WIN32)
#if defined(MEDIA_IMPLEMENTATION)
#define MEDIA_EXPORT __declspec(dllexport)
#else
#define MEDIA_EXPORT __declspec(dllimport)
#endif // defined(MEDIA_IMPLEMENTATION)
#else // defined(WIN32)
#if defined(MEDIA_IMPLEMENTATION)
#define MEDIA_EXPORT __attribute__((visibility("default")))
#else
#define MEDIA_EXPORT
#endif
#endif
#else // defined(COMPONENT_BUILD)
#define MEDIA_EXPORT
#endif
#endif // MEDIA_BASE_MEDIA_EXPORT_H_ #endif // MEDIA_BASE_MEDIA_EXPORT_H_
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment