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

Side by Side Diff: webkit/child/webkit_child.gyp

Issue 394403002: Move weburlresponse_extradata_impl.* from webkit/ to content/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: john review Created 6 years, 5 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 # Copyright 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'conditions': [ 9 'conditions': [
10 ['OS=="android"', 10 ['OS=="android"',
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 # For JNI generated header. 50 # For JNI generated header.
51 '<(SHARED_INTERMEDIATE_DIR)/webkit', 51 '<(SHARED_INTERMEDIATE_DIR)/webkit',
52 ], 52 ],
53 # This target exports a hard dependency because dependent targets may 53 # This target exports a hard dependency because dependent targets may
54 # include the header generated above. 54 # include the header generated above.
55 'hard_dependency': 1, 55 'hard_dependency': 1,
56 'sources': [ 56 'sources': [
57 'resource_loader_bridge.cc', 57 'resource_loader_bridge.cc',
58 'resource_loader_bridge.h', 58 'resource_loader_bridge.h',
59 'webkit_child_export.h', 59 'webkit_child_export.h',
60 'weburlresponse_extradata_impl.cc',
61 'weburlresponse_extradata_impl.h',
62 ], 60 ],
63 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 61 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
64 'msvs_disabled_warnings': [ 4267 ], 62 'msvs_disabled_warnings': [ 4267 ],
65 'conditions': [ 63 'conditions': [
66 ['OS=="mac"', 64 ['OS=="mac"',
67 { 65 {
68 'link_settings': { 66 'link_settings': {
69 'libraries': [ 67 'libraries': [
70 '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework', 68 '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework',
71 ], 69 ],
72 }, 70 },
73 } 71 }
74 ], 72 ],
75 ['OS=="android"', 73 ['OS=="android"',
76 { 74 {
77 'dependencies': [ 75 'dependencies': [
78 'overscroller_jni_headers', 76 'overscroller_jni_headers',
79 ], 77 ],
80 } 78 }
81 ], 79 ],
82 ], 80 ],
83 }, 81 },
84 ], 82 ],
85 } 83 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698