Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(212)

Unified Diff: mojo/mojo_public.gyp

Issue 1960703004: Revert of mojo: make libmojo_public_test_support a static library. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « mojo/mojo_js_unittests.isolate ('k') | mojo/mojo_public_bindings_unittests.isolate » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/mojo_public.gyp
diff --git a/mojo/mojo_public.gyp b/mojo/mojo_public.gyp
index f6d306e081517d29e341e27cd6756ea9e6086246..2227d7651e40e5f93ff736e4c0a7aa86f652f4c4 100644
--- a/mojo/mojo_public.gyp
+++ b/mojo/mojo_public.gyp
@@ -331,7 +331,9 @@
{
# GN version: //mojo/public/c/test_support
'target_name': 'mojo_public_test_support',
- 'type': 'static_library',
+ 'defines': [
+ 'MOJO_TEST_SUPPORT_IMPLEMENTATION',
+ ],
'include_dirs': [
'..',
],
@@ -342,9 +344,23 @@
},
'sources': [
'public/c/test_support/test_support.h',
+ 'public/c/test_support/test_support_export.h',
# TODO(vtl): Convert this to thunks http://crbug.com/386799
'public/tests/test_support_private.cc',
'public/tests/test_support_private.h',
+ ],
+ 'conditions': [
+ ['OS=="ios"', {
+ 'type': 'static_library',
+ }, {
+ 'type': 'shared_library',
+ }],
+ ['OS=="mac"', {
+ 'xcode_settings': {
+ # Make it a run-path dependent library.
+ 'DYLIB_INSTALL_NAME_BASE': '@loader_path',
+ },
+ }],
],
},
{
« no previous file with comments | « mojo/mojo_js_unittests.isolate ('k') | mojo/mojo_public_bindings_unittests.isolate » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698