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

Unified Diff: mojo/mojo_public.gypi

Issue 422163004: Extract mojo_base.gyp from mojo.gyp (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 5 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
Index: mojo/mojo_public.gypi
diff --git a/mojo/mojo_public.gypi b/mojo/mojo_public.gypi
index 42cc9f504f49a106e43e62dca7923b403a9efcde..6945edc5949006404592eab7df57bd9ed6234a41 100644
--- a/mojo/mojo_public.gypi
+++ b/mojo/mojo_public.gypi
@@ -133,37 +133,6 @@
],
},
{
- # GN version: //mojo/public/cpp/utility
- 'target_name': 'mojo_utility',
- 'type': 'static_library',
- 'sources': [
- 'public/cpp/utility/mutex.h',
- 'public/cpp/utility/run_loop.h',
- 'public/cpp/utility/run_loop_handler.h',
- 'public/cpp/utility/thread.h',
- 'public/cpp/utility/lib/mutex.cc',
- 'public/cpp/utility/lib/run_loop.cc',
- 'public/cpp/utility/lib/thread.cc',
- 'public/cpp/utility/lib/thread_local.h',
- 'public/cpp/utility/lib/thread_local_posix.cc',
- 'public/cpp/utility/lib/thread_local_win.cc',
- ],
- 'conditions': [
- # See crbug.com/342893:
- ['OS=="win"', {
- 'sources!': [
- 'public/cpp/utility/mutex.h',
- 'public/cpp/utility/thread.h',
- 'public/cpp/utility/lib/mutex.cc',
- 'public/cpp/utility/lib/thread.cc',
- ],
- }],
- ],
- 'include_dirs': [
- '..',
- ],
- },
- {
# GN version: //mojo/public/interfaces/service_provider:service_provider
'target_name': 'mojo_service_provider_bindings',
'type': 'static_library',
@@ -200,6 +169,37 @@
'mojo_service_provider_bindings',
],
},
+ {
+ # GN version: //mojo/public/cpp/utility
+ 'target_name': 'mojo_utility',
+ 'type': 'static_library',
+ 'sources': [
+ 'public/cpp/utility/mutex.h',
+ 'public/cpp/utility/run_loop.h',
+ 'public/cpp/utility/run_loop_handler.h',
+ 'public/cpp/utility/thread.h',
+ 'public/cpp/utility/lib/mutex.cc',
+ 'public/cpp/utility/lib/run_loop.cc',
+ 'public/cpp/utility/lib/thread.cc',
+ 'public/cpp/utility/lib/thread_local.h',
+ 'public/cpp/utility/lib/thread_local_posix.cc',
+ 'public/cpp/utility/lib/thread_local_win.cc',
+ ],
+ 'conditions': [
+ # See crbug.com/342893:
+ ['OS=="win"', {
+ 'sources!': [
+ 'public/cpp/utility/mutex.h',
+ 'public/cpp/utility/thread.h',
+ 'public/cpp/utility/lib/mutex.cc',
+ 'public/cpp/utility/lib/thread.cc',
+ ],
+ }],
+ ],
+ 'include_dirs': [
+ '..',
+ ],
+ },
],
'conditions': [
['OS == "android"', {
@@ -228,4 +228,4 @@
],
}],
],
-}
+}

Powered by Google App Engine
This is Rietveld 408576698