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

Side by Side Diff: ios/chrome/ios_chrome.gyp

Issue 1066013003: Revert of Upstream string_util function. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 unified diff | Download patch
« no previous file with comments | « ios/chrome/common/string_util_unittest.mm ('k') | ios/chrome/ios_chrome_tests.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 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 'targets': [ 9 'targets': [
10 { 10 {
(...skipping 21 matching lines...) Expand all
32 '../../components/components_strings.gyp:components_strings', 32 '../../components/components_strings.gyp:components_strings',
33 '../../net/net.gyp:net', 33 '../../net/net.gyp:net',
34 '../../skia/skia.gyp:skia', 34 '../../skia/skia.gyp:skia',
35 '../../third_party/google_toolbox_for_mac/google_toolbox_for_mac.gyp:goo gle_toolbox_for_mac', 35 '../../third_party/google_toolbox_for_mac/google_toolbox_for_mac.gyp:goo gle_toolbox_for_mac',
36 '../../ui/base/ui_base.gyp:ui_base', 36 '../../ui/base/ui_base.gyp:ui_base',
37 '../../ui/gfx/gfx.gyp:gfx', 37 '../../ui/gfx/gfx.gyp:gfx',
38 '../../url/url.gyp:url_lib', 38 '../../url/url.gyp:url_lib',
39 '../provider/ios_provider_chrome.gyp:ios_provider_chrome_browser', 39 '../provider/ios_provider_chrome.gyp:ios_provider_chrome_browser',
40 '../web/ios_web.gyp:ios_web', 40 '../web/ios_web.gyp:ios_web',
41 'injected_js', 41 'injected_js',
42 'ios_chrome_common',
43 'ios_chrome_resources.gyp:ios_theme_resources_gen', 42 'ios_chrome_resources.gyp:ios_theme_resources_gen',
44 ], 43 ],
45 'link_settings': { 44 'link_settings': {
46 'libraries': [ 45 'libraries': [
47 '$(SDKROOT)/System/Library/Frameworks/Accelerate.framework', 46 '$(SDKROOT)/System/Library/Frameworks/Accelerate.framework',
48 '$(SDKROOT)/System/Library/Frameworks/CoreGraphics.framework', 47 '$(SDKROOT)/System/Library/Frameworks/CoreGraphics.framework',
49 '$(SDKROOT)/System/Library/Frameworks/Foundation.framework', 48 '$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
50 '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework', 49 '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework',
51 '$(SDKROOT)/System/Library/Frameworks/UIKit.framework', 50 '$(SDKROOT)/System/Library/Frameworks/UIKit.framework',
52 ], 51 ],
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
193 'browser/ui/uikit_ui_util.h', 192 'browser/ui/uikit_ui_util.h',
194 'browser/ui/uikit_ui_util.mm', 193 'browser/ui/uikit_ui_util.mm',
195 'browser/ui/url_loader.h', 194 'browser/ui/url_loader.h',
196 'browser/web/dom_altering_lock.h', 195 'browser/web/dom_altering_lock.h',
197 'browser/web/dom_altering_lock.mm', 196 'browser/web/dom_altering_lock.mm',
198 'browser/web_resource/ios_web_resource_service.cc', 197 'browser/web_resource/ios_web_resource_service.cc',
199 'browser/web_resource/ios_web_resource_service.h', 198 'browser/web_resource/ios_web_resource_service.h',
200 ], 199 ],
201 }, 200 },
202 { 201 {
203 'target_name': 'ios_chrome_common',
204 'type': 'static_library',
205 'include_dirs': [
206 '../..',
207 ],
208 'dependencies': [
209 '../../base/base.gyp:base',
210 ],
211 'link_settings': {
212 'libraries': [
213 '$(SDKROOT)/System/Library/Frameworks/CoreGraphics.framework',
214 '$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
215 ],
216 },
217 'sources': [
218 'common/string_util.h',
219 'common/string_util.mm',
220 ]
221 },
222 {
223 'target_name': 'injected_js', 202 'target_name': 'injected_js',
224 'type': 'none', 203 'type': 'none',
225 'sources': [ 204 'sources': [
226 'browser/find_in_page/resources/find_in_page.js', 205 'browser/find_in_page/resources/find_in_page.js',
227 ], 206 ],
228 'includes': [ 207 'includes': [
229 '../../ios/web/js_compile.gypi', 208 '../../ios/web/js_compile.gypi',
230 ], 209 ],
231 'link_settings': { 210 'link_settings': {
232 'mac_bundle_resources': [ 211 'mac_bundle_resources': [
233 '<(SHARED_INTERMEDIATE_DIR)/find_in_page.js', 212 '<(SHARED_INTERMEDIATE_DIR)/find_in_page.js',
234 ], 213 ],
235 }, 214 },
236 }, 215 },
237 ], 216 ],
238 } 217 }
OLDNEW
« no previous file with comments | « ios/chrome/common/string_util_unittest.mm ('k') | ios/chrome/ios_chrome_tests.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698