diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-31 20:23:29 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-31 20:23:29 +0000 |
| commit | 3f9b509ae3d5f55324e7ede31585d6ae9c4bea1e (patch) | |
| tree | 91e29367822cce4717e070c308b199729c281dd8 /mojo | |
| parent | 978f5355315d66fb245b45bf3a9b146b847c712e (diff) | |
| download | chromium_src-3f9b509ae3d5f55324e7ede31585d6ae9c4bea1e.zip chromium_src-3f9b509ae3d5f55324e7ede31585d6ae9c4bea1e.tar.gz chromium_src-3f9b509ae3d5f55324e7ede31585d6ae9c4bea1e.tar.bz2 | |
Make mojo_system honor component type
We've figured out a way to make things work without a shared library, so libmojo_system is no more.
BUG=none
TEST=none
R=viettrungluu@chromium.org
Review URL: https://codereview.chromium.org/215153007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@260629 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'mojo')
| -rw-r--r-- | mojo/mojo_apps_js_unittests.isolate | 2 | ||||
| -rw-r--r-- | mojo/mojo_js_unittests.isolate | 2 | ||||
| -rw-r--r-- | mojo/mojo_public.gypi | 2 | ||||
| -rw-r--r-- | mojo/public/c/system/system_export.h | 7 |
4 files changed, 8 insertions, 5 deletions
diff --git a/mojo/mojo_apps_js_unittests.isolate b/mojo/mojo_apps_js_unittests.isolate index 660ebaa..23c345c 100644 --- a/mojo/mojo_apps_js_unittests.isolate +++ b/mojo/mojo_apps_js_unittests.isolate @@ -51,7 +51,6 @@ ['OS=="linux"', { 'variables': { 'isolate_dependency_tracked': [ - '<(PRODUCT_DIR)/lib/libmojo_system.so', '<(PRODUCT_DIR)/lib/libmojo_test_support.so', ], }, @@ -71,7 +70,6 @@ 'variables': { 'isolate_dependency_tracked': [ '<(PRODUCT_DIR)/libmojo_gles2.dylib', - '<(PRODUCT_DIR)/libmojo_system.dylib', '<(PRODUCT_DIR)/libmojo_test_support.dylib', ], }, diff --git a/mojo/mojo_js_unittests.isolate b/mojo/mojo_js_unittests.isolate index 3a8699c..7081f75 100644 --- a/mojo/mojo_js_unittests.isolate +++ b/mojo/mojo_js_unittests.isolate @@ -50,7 +50,6 @@ ['OS=="linux"', { 'variables': { 'isolate_dependency_tracked': [ - '<(PRODUCT_DIR)/lib/libmojo_system.so', '<(PRODUCT_DIR)/lib/libmojo_test_support.so', ], }, @@ -69,7 +68,6 @@ ['OS=="mac"', { 'variables': { 'isolate_dependency_tracked': [ - '<(PRODUCT_DIR)/libmojo_system.dylib', '<(PRODUCT_DIR)/libmojo_test_support.dylib', ], }, diff --git a/mojo/mojo_public.gypi b/mojo/mojo_public.gypi index ff0a809..1b0b4e4 100644 --- a/mojo/mojo_public.gypi +++ b/mojo/mojo_public.gypi @@ -2,7 +2,7 @@ 'targets': [ { 'target_name': 'mojo_system', - 'type': 'shared_library', + 'type': '<(component)', 'defines': [ 'MOJO_SYSTEM_IMPLEMENTATION', ], diff --git a/mojo/public/c/system/system_export.h b/mojo/public/c/system/system_export.h index 3bd0260..775f667 100644 --- a/mojo/public/c/system/system_export.h +++ b/mojo/public/c/system/system_export.h @@ -5,6 +5,7 @@ #ifndef MOJO_PUBLIC_C_SYSTEM_SYSTEM_EXPORT_H_ #define MOJO_PUBLIC_C_SYSTEM_SYSTEM_EXPORT_H_ +#if defined(COMPONENT_BUILD) #if defined(WIN32) #if defined(MOJO_SYSTEM_IMPLEMENTATION) @@ -23,4 +24,10 @@ #endif // defined(WIN32) +#else // !defined(COMPONENT_BUILD) + +#define MOJO_SYSTEM_EXPORT + +#endif // defined(COMPONENT_BUILD) + #endif // MOJO_PUBLIC_C_SYSTEM_SYSTEM_EXPORT_H_ |