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

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

Issue 1073863005: Upstream string_util function. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: missing , 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
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',
42 'ios_chrome_resources.gyp:ios_theme_resources_gen', 43 'ios_chrome_resources.gyp:ios_theme_resources_gen',
43 ], 44 ],
44 'link_settings': { 45 'link_settings': {
45 'libraries': [ 46 'libraries': [
46 '$(SDKROOT)/System/Library/Frameworks/Accelerate.framework', 47 '$(SDKROOT)/System/Library/Frameworks/Accelerate.framework',
47 '$(SDKROOT)/System/Library/Frameworks/CoreGraphics.framework', 48 '$(SDKROOT)/System/Library/Frameworks/CoreGraphics.framework',
48 '$(SDKROOT)/System/Library/Frameworks/Foundation.framework', 49 '$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
49 '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework', 50 '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework',
50 '$(SDKROOT)/System/Library/Frameworks/UIKit.framework', 51 '$(SDKROOT)/System/Library/Frameworks/UIKit.framework',
51 ], 52 ],
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
192 'browser/ui/uikit_ui_util.h', 193 'browser/ui/uikit_ui_util.h',
193 'browser/ui/uikit_ui_util.mm', 194 'browser/ui/uikit_ui_util.mm',
194 'browser/ui/url_loader.h', 195 'browser/ui/url_loader.h',
195 'browser/web/dom_altering_lock.h', 196 'browser/web/dom_altering_lock.h',
196 'browser/web/dom_altering_lock.mm', 197 'browser/web/dom_altering_lock.mm',
197 'browser/web_resource/ios_web_resource_service.cc', 198 'browser/web_resource/ios_web_resource_service.cc',
198 'browser/web_resource/ios_web_resource_service.h', 199 'browser/web_resource/ios_web_resource_service.h',
199 ], 200 ],
200 }, 201 },
201 { 202 {
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/Foundation.framework',
droger 2015/04/13 09:49:13 Looks like we also need: '$(SDKROOT)/System/Librar
Olivier 2015/04/13 16:02:05 Done.
214 ],
215 },
216 'sources': [
217 'common/string_util.h',
218 'common/string_util.mm',
219 ]
220 },
221 {
202 'target_name': 'injected_js', 222 'target_name': 'injected_js',
203 'type': 'none', 223 'type': 'none',
204 'sources': [ 224 'sources': [
205 'browser/find_in_page/resources/find_in_page.js', 225 'browser/find_in_page/resources/find_in_page.js',
206 ], 226 ],
207 'includes': [ 227 'includes': [
208 '../../ios/web/js_compile.gypi', 228 '../../ios/web/js_compile.gypi',
209 ], 229 ],
210 'link_settings': { 230 'link_settings': {
211 'mac_bundle_resources': [ 231 'mac_bundle_resources': [
212 '<(SHARED_INTERMEDIATE_DIR)/find_in_page.js', 232 '<(SHARED_INTERMEDIATE_DIR)/find_in_page.js',
213 ], 233 ],
214 }, 234 },
215 }, 235 },
216 ], 236 ],
217 } 237 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698