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

Unified Diff: content/content_tests.gypi

Issue 14823005: Remove inside_chromium_build gyp variable (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sort gyps, fix ios Created 7 years, 7 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 | « content/content_shell.gypi ('k') | content/content_worker.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/content_tests.gypi
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index 7818c552294fb4bc916d4c5c686995cfe8598c54..36aff2612ea450e25d0ddd8a24da106ce804e9de 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -168,8 +168,8 @@
'../ppapi/ppapi_internal.gyp:ppapi_proxy',
'../ppapi/ppapi_internal.gyp:ppapi_shared',
'../ppapi/ppapi_internal.gyp:ppapi_unittest_shared',
- '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
- '<(webkit_src_dir)/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:TestRunner',
+ '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
+ '../third_party/WebKit/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:TestRunner',
'../ui/surface/surface.gyp:surface',
'../webkit/compositor_bindings/compositor_bindings.gyp:webkit_compositor_support',
'../webkit/gpu/webkit_gpu.gyp:webkit_gpu',
@@ -563,11 +563,11 @@
'../ipc/ipc.gyp:test_support_ipc',
'../jingle/jingle.gyp:jingle_glue_test_util',
'../media/media.gyp:shared_memory_support',
+ '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
'../third_party/icu/icu.gyp:icui18n',
'../third_party/icu/icu.gyp:icuuc',
'../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
'../third_party/libjingle/libjingle.gyp:libjingle',
- '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
'../ui/gl/gl.gyp:gl',
'../v8/tools/gyp/v8.gyp:v8',
'../webkit/support/webkit_support.gyp:glue',
@@ -717,13 +717,14 @@
'../ipc/ipc.gyp:test_support_ipc',
'../net/net.gyp:net_test_support',
'../ppapi/ppapi_internal.gyp:ppapi_host',
- '../ppapi/ppapi_internal.gyp:ppapi_proxy',
'../ppapi/ppapi_internal.gyp:ppapi_ipc',
+ '../ppapi/ppapi_internal.gyp:ppapi_proxy',
'../ppapi/ppapi_internal.gyp:ppapi_shared',
'../ppapi/ppapi_internal.gyp:ppapi_unittest_shared',
'../skia/skia.gyp:skia',
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
+ '../third_party/WebKit/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:TestRunner_resources',
'../third_party/mesa/mesa.gyp:osmesa',
'../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h',
'../ui/gl/gl.gyp:gl',
@@ -732,7 +733,6 @@
'../ui/ui.gyp:ui',
'../webkit/support/webkit_support.gyp:clearkeycdmadapter',
'../webkit/support/webkit_support.gyp:glue',
- '<(webkit_src_dir)/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:TestRunner_resources',
],
'include_dirs': [
'..',
« no previous file with comments | « content/content_shell.gypi ('k') | content/content_worker.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698