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

Unified Diff: content/content_tests.gypi

Issue 228003006: Remove dependency on --gc-sections for most Android debug targets. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Nits Created 6 years, 8 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
Index: content/content_tests.gypi
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index cfdda71a6ea2bf3d4c28ba88efc4838ad154af47..304289d1fb46922a908e138f7e518a289b8eaf6f 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -55,7 +55,9 @@
'../ui/gfx/gfx.gyp:gfx_geometry',
'../ui/gfx/gfx.gyp:gfx_test_support',
'../ui/resources/ui_resources.gyp:ui_resources',
+ '../v8/tools/gyp/v8.gyp:v8',
'../url/url.gyp:url_lib',
+ '../webkit/common/webkit_common.gyp:webkit_common',
'browser/speech/proto/speech_proto.gyp:speech_proto',
'content.gyp:content_app_both',
'content.gyp:content_browser',
@@ -201,8 +203,21 @@
'test/weburl_loader_mock.h',
'test/weburl_loader_mock_factory.cc',
'test/weburl_loader_mock_factory.h',
+ # Required by test_file_system_context.cc
+ '../webkit/browser/quota/mock_special_storage_policy.cc',
+ '../webkit/browser/quota/mock_special_storage_policy.h',
Nico 2014/04/11 20:36:59 This looks really icky. It looks like two other ta
Primiano Tucci (use gerrit) 2014/04/12 10:26:00 Hmm, I am not completely sure I got the sense of "
Nico 2014/04/14 15:23:07 Yes.
jam 2014/04/14 16:18:06 note: i would ignore this for now, these files are
],
'conditions': [
+ ['enable_plugins==0', {
+ 'sources!': [
+ 'test/ppapi_unittest.cc',
+ ],
+ }],
+ ['input_speech==0', {
+ 'sources!': [
+ 'test/mock_google_streaming_server.cc',
+ ],
+ }],
['OS == "ios"', {
'sources/': [
# iOS only needs a small portion of content; exclude all the
@@ -651,8 +666,6 @@
'../webkit/common/database/database_connections_unittest.cc',
'../webkit/common/database/database_identifier_unittest.cc',
'../webkit/common/fileapi/file_system_util_unittest.cc',
- '../webkit/browser/quota/mock_special_storage_policy.cc',
- '../webkit/browser/quota/mock_special_storage_policy.h',
'../webkit/browser/quota/mock_storage_client.cc',
'../webkit/browser/quota/mock_storage_client.h',
'../webkit/browser/quota/quota_database_unittest.cc',
@@ -694,8 +707,6 @@
'../third_party/libjingle/libjingle.gyp:libjingle',
'../ui/compositor/compositor.gyp:compositor_test_support',
'../ui/gl/gl.gyp:gl',
- '../v8/tools/gyp/v8.gyp:v8',
- '../webkit/common/webkit_common.gyp:webkit_common',
'../webkit/child/webkit_child.gyp:webkit_child',
'../webkit/storage_browser.gyp:webkit_storage_browser',
'../webkit/storage_common.gyp:webkit_storage_common',
@@ -1263,11 +1274,12 @@
'../testing/gtest.gyp:gtest',
'../third_party/WebKit/public/blink.gyp:blink',
'../ui/base/ui_base.gyp:ui_base',
+ '../v8/tools/gyp/v8.gyp:v8',
'../ui/gfx/gfx.gyp:gfx',
'../ui/gfx/gfx.gyp:gfx_geometry',
'../ui/gl/gl.gyp:gl',
- # The following two dependencies provide the missing
- # symbol HeapProfilerStart in Linux component builds.
+ # The following dependency provides the missing symbol
+ # HeapProfilerStart in Linux component builds.
'../webkit/child/webkit_child.gyp:webkit_child',
],
'include_dirs': [

Powered by Google App Engine
This is Rietveld 408576698