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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/chrome_browser.gypi

Issue 11361056: Add structural support for building chrome_browser.gyp on iOS (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Restore variations_seed_proto Created 8 years, 1 month 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 | « build/common.gypi ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_browser.gypi
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index b7b8d765d53d23639efbc88aaa6c7e49768eae33..5b81dc46431f007d7ca1b791868a02d597cf035b 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -10,10 +10,8 @@
'type': 'static_library',
'variables': { 'enable_wexit_time_destructors': 1, },
'dependencies': [
- 'autofill_regexes',
- 'browser/component/components.gyp:navigation_interception',
- 'browser/performance_monitor/performance_monitor.gyp:performance_monitor',
- 'browser_extensions',
+ # NOTE: New dependencies should generally be added in the OS!="ios"
+ # dependencies block below, rather than here.
'browser_ui',
'cert_logger_proto',
'chrome_resources.gyp:chrome_extra_resources',
@@ -22,15 +20,11 @@
'chrome_resources.gyp:platform_locale_settings',
'chrome_resources.gyp:theme_resources',
'common',
- 'common/extensions/api/api.gyp:api',
'common_net',
- 'debugger',
'feedback_proto',
'in_memory_url_index_cache_proto',
- 'installer_util',
'safe_browsing_proto',
'safe_browsing_report_proto',
- 'sync_file_system_proto',
'variations_seed_proto',
'../build/temp_gyp/googleurl.gyp:googleurl',
'../content/content.gyp:content_browser',
@@ -38,43 +32,25 @@
'../crypto/crypto.gyp:crypto',
'../google_apis/google_apis.gyp:google_apis',
'../media/media.gyp:media',
- '../net/net.gyp:net_with_v8',
- '../ppapi/ppapi_internal.gyp:ppapi_ipc', # For PpapiMsg_LoadPlugin
- '../printing/printing.gyp:printing',
'../skia/skia.gyp:skia',
'../sync/protocol/sync_proto.gyp:sync_proto',
# TODO(akalin): Depend only on syncapi_service from sync.
'../sync/sync.gyp:syncapi_core',
'../sync/sync.gyp:syncapi_service',
'../sync/sync.gyp:sync_notifier',
- '../third_party/adobe/flash/flash_player.gyp:flapper_version_h',
'../third_party/bzip2/bzip2.gyp:bzip2',
'../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation',
'../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_proto_cpp',
- '../third_party/cld/cld.gyp:cld',
- '../third_party/expat/expat.gyp:expat',
- '../third_party/hunspell/hunspell.gyp:hunspell',
'../third_party/icu/icu.gyp:icui18n',
'../third_party/icu/icu.gyp:icuuc',
- '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
- '../third_party/libjingle/libjingle.gyp:libjingle',
- '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber',
'../third_party/libusb/libusb.gyp:libusb',
'../third_party/libxml/libxml.gyp:libxml',
- '../third_party/npapi/npapi.gyp:npapi',
- '../third_party/re2/re2.gyp:re2',
'../third_party/zlib/zlib.gyp:minizip',
'../third_party/zlib/zlib.gyp:zlib',
'../ui/base/strings/ui_strings.gyp:ui_strings',
- '../ui/surface/surface.gyp:surface',
'../ui/ui.gyp:ui',
'../ui/ui.gyp:ui_resources',
- '../ui/web_dialogs/web_dialogs.gyp:web_dialogs',
- '../v8/tools/gyp/v8.gyp:v8',
- '../webkit/support/webkit_support.gyp:glue',
'../webkit/support/webkit_support.gyp:user_agent',
- '../webkit/support/webkit_support.gyp:webkit_resources',
- '../webkit/support/webkit_support.gyp:webkit_storage',
],
'include_dirs': [
'..',
@@ -82,14 +58,6 @@
# Needed by pepper_flash_component_installer.cc.
'<(SHARED_INTERMEDIATE_DIR)',
],
- 'defines': [
- '<@(nacl_defines)',
- ],
- 'direct_dependent_settings': {
- 'defines': [
- '<@(nacl_defines)',
- ],
- },
'export_dependent_settings': [
'../sync/sync.gyp:sync_notifier',
],
@@ -2179,6 +2147,64 @@
'<(SHARED_INTERMEDIATE_DIR)/autofill_regex_constants.cc',
],
'conditions': [
+ ['OS != "ios"', {
+ 'dependencies': [
+ 'autofill_regexes',
+ 'browser/component/components.gyp:navigation_interception',
+ 'browser/performance_monitor/performance_monitor.gyp:performance_monitor',
+ 'browser_extensions',
+ 'common/extensions/api/api.gyp:api',
+ 'debugger',
+ 'installer_util',
+ 'sync_file_system_proto',
+ '../net/net.gyp:net_with_v8',
+ '../ppapi/ppapi_internal.gyp:ppapi_ipc', # For PpapiMsg_LoadPlugin
+ '../printing/printing.gyp:printing',
+ '../third_party/adobe/flash/flash_player.gyp:flapper_version_h',
+ '../third_party/cld/cld.gyp:cld',
+ '../third_party/expat/expat.gyp:expat',
+ '../third_party/hunspell/hunspell.gyp:hunspell',
+ '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
+ '../third_party/libjingle/libjingle.gyp:libjingle',
+ '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber',
+ '../third_party/npapi/npapi.gyp:npapi',
+ '../third_party/re2/re2.gyp:re2',
+ '../ui/surface/surface.gyp:surface',
+ '../ui/web_dialogs/web_dialogs.gyp:web_dialogs',
+ '../v8/tools/gyp/v8.gyp:v8',
+ '../webkit/support/webkit_support.gyp:glue',
+ '../webkit/support/webkit_support.gyp:webkit_resources',
+ '../webkit/support/webkit_support.gyp:webkit_storage',
+ ],
+ 'defines': [
+ '<@(nacl_defines)',
+ ],
+ 'direct_dependent_settings': {
+ 'defines': [
+ '<@(nacl_defines)',
+ ],
+ },
+ }, { # OS == "ios"
+ 'dependencies': [
+ '../net/net.gyp:net',
+ ],
+ 'sources/': [
+ # Exclude everything but iOS-specific files.
+ ['exclude', '\\.(cc|mm)$'],
+ ['include', '_ios\\.(cc|mm)$'],
+ ['include', '(^|/)ios/'],
+ # TODO(ios): Add files here as they are updated to compile on iOS.
+ ],
+ 'link_settings': {
+ 'libraries': [
+ '$(SDKROOT)/System/Library/Frameworks/CoreTelephony.framework',
+ '$(SDKROOT)/System/Library/Frameworks/CoreText.framework',
+ '$(SDKROOT)/System/Library/Frameworks/MobileCoreServices.framework',
+ '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework',
+ ],
+ 'xcode_settings': {'OTHER_LDFLAGS': ['-weak_framework CoreImage']},
Nico 2012/11/02 15:16:13 Add "# CoreImage is iOS 5+, but chrome/ios runs su
stuartmorgan 2012/11/02 15:27:56 Done (4.3 is indeed supported)
+ },
+ }],
['enable_one_click_signin==0', {
'sources!': [
'browser/api/infobars/one_click_signin_infobar_delegate.cc',
@@ -2437,14 +2463,14 @@
'../ui/gl/gl.gyp:gl',
],
}],
- ['os_posix == 1 and OS != "mac" and OS != "android"', {
+ ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', {
'link_settings': {
'libraries': [
'-lXss',
],
},
}],
- ['os_posix == 1 and OS != "mac"', {
+ ['os_posix == 1 and OS != "mac" and OS != "ios"', {
'sources': [ 'browser/crash_handler_host_linux.h', ],
'conditions': [
['linux_breakpad==1', {
@@ -2757,7 +2783,7 @@
['include', '^browser/printing/print_dialog_gtk.h'],
],
}],
- ['os_posix == 1 and OS != "mac" and OS != "android" and gcc_version == 45', {
+ ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android" and gcc_version == 45', {
# Avoid gcc 4.5 miscompilation of template_url.cc
# as per http://crbug.com/41887
'cflags': [
« no previous file with comments | « build/common.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698