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

Unified Diff: chrome/chrome_tests.gypi

Issue 12093013: Revert 179097 googleurl.gyp include_dir escapes src and is breaking android build. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 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 | « build/temp_gyp/googleurl.gyp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_tests.gypi
===================================================================
--- chrome/chrome_tests.gypi (revision 179103)
+++ chrome/chrome_tests.gypi (working copy)
@@ -2821,19 +2821,19 @@
# Disabled from running in coverage_posix.py.
# We need to build this during compile step, so enabling here.
'browser_tests',
+ '../courgette/courgette.gyp:courgette_unittests',
+ '../crypto/crypto.gyp:crypto_unittests',
'chromedriver_unittests',
+ '../build/temp_gyp/googleurl.gyp:googleurl_unittests',
'gpu_tests',
+ '../jingle/jingle.gyp:jingle_unittests',
+ '../net/net.gyp:net_perftests',
'performance_ui_tests',
- 'pyautolib',
'reliability_tests',
'sync_integration_tests',
+ '../third_party/WebKit/Source/WebKit/chromium/WebKitUnitTests.gyp:webkit_unit_tests',
+ 'pyautolib',
'../content/content.gyp:content_browsertests',
- '../courgette/courgette.gyp:courgette_unittests',
- '../crypto/crypto.gyp:crypto_unittests',
- '../googleurl/googleurl.gyp:googleurl_unittests',
- '../jingle/jingle.gyp:jingle_unittests',
- '../net/net.gyp:net_perftests',
- '../third_party/WebKit/Source/WebKit/chromium/WebKitUnitTests.gyp:webkit_unit_tests',
]}],
['OS=="mac"', {
'dependencies': [
« no previous file with comments | « build/temp_gyp/googleurl.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698