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

Unified Diff: chrome/browser/media/router/media_router.gyp

Issue 1410053006: Move third_party/mojo/src/mojo/public to mojo/public (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 5 years, 1 month 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: chrome/browser/media/router/media_router.gyp
diff --git a/chrome/browser/media/router/media_router.gyp b/chrome/browser/media/router/media_router.gyp
index 186c74977698c79d53fb038488dbb0969e1fc7d1..78c49b4e493b9b1d41f2e4856650b76dd4c3180e 100644
--- a/chrome/browser/media/router/media_router.gyp
+++ b/chrome/browser/media/router/media_router.gyp
@@ -27,9 +27,6 @@
],
'conditions': [
[ 'OS!="android" and OS!="ios"', {
- 'include_dirs': [
- '<(DEPTH)/third_party/mojo/src',
- ],
'dependencies': [
# media_router_type_converters.h needs the generated file.
'media_router_mojo_gen',
@@ -40,7 +37,7 @@
'<@(media_router_non_android_sources)',
]
}],
- ]
+ ]
},
{
# Mojo compiler for the Media Router internal API.
@@ -50,15 +47,12 @@
'media_router.mojom',
],
'includes': [
- '../../../../third_party/mojo/mojom_bindings_generator.gypi',
+ '../../../../mojo/mojom_bindings_generator.gypi',
],
},
{
'target_name': 'media_router_mojo',
'type': 'static_library',
- 'include_dirs': [
- '<(DEPTH)/third_party/mojo/src',
- ],
'dependencies': [
'media_router_mojo_gen',
],
@@ -73,7 +67,6 @@
'type': 'static_library',
'include_dirs': [
'<(DEPTH)',
- '<(DEPTH)/third_party/mojo/src',
],
'dependencies': [
'media_router',

Powered by Google App Engine
This is Rietveld 408576698