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

Unified Diff: build/all.gyp

Issue 885443002: Roll Chrome into Mojo. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Rebase to ToT mojo Created 5 years, 11 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 | « base/trace_event/trace_event_win_unittest.cc ('k') | build/android/adb_gdb » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/all.gyp
diff --git a/build/all.gyp b/build/all.gyp
index e157cd2200687be64ecf5575e9748bc874066ac4..0888d8cfb4ec1ca472206917ecf808cd0d1397b9 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -323,7 +323,8 @@
'../content/content_shell_and_tests.gyp:content_shell',
'../content/content_shell_and_tests.gyp:content_unittests',
'../device/device_tests.gyp:device_unittests',
- '../extensions/extensions.gyp:extensions_unittests',
+ '../extensions/extensions_tests.gyp:extensions_browsertests',
+ '../extensions/extensions_tests.gyp:extensions_unittests',
'../gin/gin.gyp:gin_unittests',
'../google_apis/google_apis.gyp:google_apis_unittests',
'../gpu/gles2_conform_support/gles2_conform_support.gyp:gles2_conform_support',
@@ -1150,7 +1151,8 @@
'../courgette/courgette.gyp:courgette_unittests',
'../crypto/crypto.gyp:crypto_unittests',
'../device/device_tests.gyp:device_unittests',
- '../extensions/extensions.gyp:extensions_unittests',
+ '../extensions/extensions_tests.gyp:extensions_browsertests',
+ '../extensions/extensions_tests.gyp:extensions_unittests',
'../gin/gin.gyp:gin_shell',
'../gin/gin.gyp:gin_unittests',
'../google_apis/gcm/gcm.gyp:gcm_unit_tests',
« no previous file with comments | « base/trace_event/trace_event_win_unittest.cc ('k') | build/android/adb_gdb » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698