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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: build/all.gyp

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 | « no previous file | build/temp_gyp/googleurl.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/all.gyp
===================================================================
--- build/all.gyp (revision 179103)
+++ build/all.gyp (working copy)
@@ -188,11 +188,11 @@
'../base/base.gyp:base_unittests',
'../chrome/chrome.gyp:unit_tests',
'../crypto/crypto.gyp:crypto_unittests',
- '../googleurl/googleurl.gyp:googleurl_unittests',
'../media/media.gyp:media_unittests',
'../net/net.gyp:net_unittests',
'../sql/sql.gyp:sql_unittests',
'../ui/ui.gyp:ui_unittests',
+ 'temp_gyp/googleurl.gyp:googleurl_unittests',
],
'conditions': [
['OS!="ios"', {
@@ -404,7 +404,7 @@
'../content/content.gyp:content_browsertests',
'../content/content.gyp:content_unittests',
'../device/device.gyp:device_unittests',
- '../googleurl/googleurl.gyp:googleurl_unittests',
+ '../ui/ui.gyp:ui_unittests',
'../gpu/gpu.gyp:gpu_unittests',
'../ipc/ipc.gyp:ipc_tests',
'../jingle/jingle.gyp:jingle_unittests',
@@ -417,8 +417,8 @@
'../sync/sync.gyp:sync_unit_tests',
'../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests',
'../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests',
- '../ui/ui.gyp:ui_unittests',
'../webkit/compositor_bindings/compositor_bindings_tests.gyp:webkit_compositor_bindings_unittests',
+ 'temp_gyp/googleurl.gyp:googleurl_unittests',
],
},
{
@@ -436,7 +436,7 @@
'../content/content.gyp:content_browsertests',
'../content/content.gyp:content_unittests',
'../device/device.gyp:device_unittests',
- '../googleurl/googleurl.gyp:googleurl_unittests',
+ '../ui/ui.gyp:ui_unittests',
'../gpu/gpu.gyp:gpu_unittests',
'../ipc/ipc.gyp:ipc_tests',
'../jingle/jingle.gyp:jingle_unittests',
@@ -448,8 +448,8 @@
'../sync/sync.gyp:sync_unit_tests',
'../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests',
'../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests',
- '../ui/ui.gyp:ui_unittests',
'../webkit/compositor_bindings/compositor_bindings_tests.gyp:webkit_compositor_bindings_unittests',
+ 'temp_gyp/googleurl.gyp:googleurl_unittests',
],
},
{
@@ -459,7 +459,7 @@
'../base/base.gyp:base_unittests',
'../cloud_print/cloud_print.gyp:cloud_print_unittests',
'../crypto/crypto.gyp:crypto_unittests',
- '../googleurl/googleurl.gyp:googleurl_unittests',
+ 'temp_gyp/googleurl.gyp:googleurl_unittests',
'../net/net.gyp:net_unittests',
'../ipc/ipc.gyp:ipc_tests',
'../jingle/jingle.gyp:jingle_unittests',
@@ -484,24 +484,24 @@
'type': 'none',
'dependencies': [
'../base/base.gyp:base_unittests',
- '../chrome/chrome.gyp:unit_tests',
'../cloud_print/cloud_print.gyp:cloud_print_unittests',
- '../components/components.gyp:components_unittests',
- '../content/content.gyp:content_unittests',
'../crypto/crypto.gyp:crypto_unittests',
- '../device/device.gyp:device_unittests',
- '../googleurl/googleurl.gyp:googleurl_unittests',
'../ipc/ipc.gyp:ipc_tests',
- '../jingle/jingle.gyp:jingle_unittests',
'../media/media.gyp:media_unittests',
'../net/net.gyp:net_unittests',
'../printing/printing.gyp:printing_unittests',
'../remoting/remoting.gyp:remoting_unittests',
+ '../chrome/chrome.gyp:unit_tests',
+ '../components/components.gyp:components_unittests',
+ '../content/content.gyp:content_unittests',
+ '../device/device.gyp:device_unittests',
+ '../ui/ui.gyp:ui_unittests',
+ '../jingle/jingle.gyp:jingle_unittests',
'../sql/sql.gyp:sql_unittests',
'../sync/sync.gyp:sync_unit_tests',
'../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests',
- '../ui/ui.gyp:ui_unittests',
'../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests',
+ 'temp_gyp/googleurl.gyp:googleurl_unittests',
],
},
], # targets
@@ -529,16 +529,16 @@
'../content/content.gyp:content_unittests',
# mini_installer_tests depends on mini_installer. This should be
# defined in installer.gyp.
+ '../chrome/installer/mini_installer.gyp:mini_installer',
'../chrome_frame/chrome_frame.gyp:chrome_frame_net_tests',
'../chrome_frame/chrome_frame.gyp:chrome_frame_perftests',
'../chrome_frame/chrome_frame.gyp:chrome_frame_reliability_tests',
'../chrome_frame/chrome_frame.gyp:chrome_frame_tests',
'../chrome_frame/chrome_frame.gyp:chrome_frame_unittests',
'../chrome_frame/chrome_frame.gyp:npchrome_frame',
- '../chrome/installer/mini_installer.gyp:mini_installer',
'../courgette/courgette.gyp:courgette_unittests',
'../device/device.gyp:device_unittests',
- '../googleurl/googleurl.gyp:googleurl_unittests',
+ '../ui/ui.gyp:ui_unittests',
'../gpu/gpu.gyp:gpu_unittests',
'../ipc/ipc.gyp:ipc_tests',
'../jingle/jingle.gyp:jingle_unittests',
@@ -550,10 +550,10 @@
'../sync/sync.gyp:sync_unit_tests',
'../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests',
'../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests',
- '../ui/ui.gyp:ui_unittests',
'../ui/views/views.gyp:views_unittests',
'../webkit/compositor_bindings/compositor_bindings_tests.gyp:webkit_compositor_bindings_unittests',
'../webkit/webkit.gyp:pull_in_copy_TestNetscapePlugIn',
+ 'temp_gyp/googleurl.gyp:googleurl_unittests',
],
'conditions': [
['use_aura==1', {
@@ -587,7 +587,6 @@
'../components/components.gyp:components_unittests',
'../content/content.gyp:content_unittests',
'../crypto/crypto.gyp:crypto_unittests',
- '../googleurl/googleurl.gyp:googleurl_unittests',
'../ipc/ipc.gyp:ipc_tests',
'../jingle/jingle.gyp:jingle_unittests',
'../media/media.gyp:media_unittests',
@@ -597,6 +596,7 @@
'../sql/sql.gyp:sql_unittests',
'../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests',
'../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests',
+ 'temp_gyp/googleurl.gyp:googleurl_unittests',
],
},
{
@@ -610,7 +610,6 @@
'../content/content.gyp:content_unittests',
'../crypto/crypto.gyp:crypto_unittests',
'../device/device.gyp:device_unittests',
- '../googleurl/googleurl.gyp:googleurl_unittests',
'../ipc/ipc.gyp:ipc_tests',
'../jingle/jingle.gyp:jingle_unittests',
'../media/media.gyp:media_unittests',
@@ -620,6 +619,7 @@
'../sql/sql.gyp:sql_unittests',
'../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests',
'../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests',
+ 'temp_gyp/googleurl.gyp:googleurl_unittests',
],
},
{
« no previous file with comments | « no previous file | build/temp_gyp/googleurl.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698