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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/net.gyp

Issue 933293003: [Cronet] Make Cronet buildable on regular Android bots. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Extract cronet_static.gypi Created 5 years, 10 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
« components/cronet.gypi ('K') | « components/cronet/cronet_static.gypi ('k') | net/net_common.gypi » ('j') | net/net_common.gypi » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/net.gyp
diff --git a/net/net.gyp b/net/net.gyp
index 54f90bd4f863bfe5ffe70f9fe076d1cb94d882ee..337e420296936363dc77e174ff687c417218026b 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -81,443 +81,7 @@
},
{
'target_name': 'net',
- 'type': '<(component)',
- 'variables': { 'enable_wexit_time_destructors': 1, },
- 'dependencies': [
- '../base/base.gyp:base',
- '../base/base.gyp:base_i18n',
- '../base/base.gyp:base_prefs',
- '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
- '../crypto/crypto.gyp:crypto',
- '../sdch/sdch.gyp:sdch',
- '../third_party/icu/icu.gyp:icui18n',
- '../third_party/icu/icu.gyp:icuuc',
- '../third_party/zlib/zlib.gyp:zlib',
- '../url/url.gyp:url_lib',
- 'net_derived_sources',
- 'net_resources',
- ],
- 'sources': [
- '<@(net_nacl_common_sources)',
- '<@(net_non_nacl_sources)',
- ],
- 'defines': [
- 'NET_IMPLEMENTATION',
- ],
- 'export_dependent_settings': [
- '../base/base.gyp:base',
- ],
- 'conditions': [
- ['chromeos==1', {
- 'sources!': [
- 'base/network_change_notifier_linux.cc',
- 'base/network_change_notifier_linux.h',
- 'base/network_change_notifier_netlink_linux.cc',
- 'base/network_change_notifier_netlink_linux.h',
- 'proxy/proxy_config_service_linux.cc',
- 'proxy/proxy_config_service_linux.h',
- ],
- }],
- ['use_kerberos==1', {
- 'defines': [
- 'USE_KERBEROS',
- ],
- 'conditions': [
- ['OS=="openbsd"', {
- 'include_dirs': [
- '/usr/include/kerberosV'
- ],
- }],
- ['linux_link_kerberos==1', {
- 'link_settings': {
- 'ldflags': [
- '<!@(krb5-config --libs gssapi)',
- ],
- },
- }, { # linux_link_kerberos==0
- 'defines': [
- 'DLOPEN_KERBEROS',
- ],
- }],
- ],
- }, { # use_kerberos == 0
- 'sources!': [
- 'http/http_auth_gssapi_posix.cc',
- 'http/http_auth_gssapi_posix.h',
- 'http/http_auth_handler_negotiate.cc',
- 'http/http_auth_handler_negotiate.h',
- ],
- }],
- ['posix_avoid_mmap==1', {
- 'defines': [
- 'POSIX_AVOID_MMAP',
- ],
- 'direct_dependent_settings': {
- 'defines': [
- 'POSIX_AVOID_MMAP',
- ],
- },
- 'sources!': [
- 'disk_cache/blockfile/mapped_file_posix.cc',
- ],
- }, { # else
- 'sources!': [
- 'disk_cache/blockfile/mapped_file_avoid_mmap_posix.cc',
- ],
- }],
- ['disable_file_support==1', {
- # TODO(mmenke): Should probably get rid of the dependency on
- # net_resources in this case (It's used in net_util, to format
- # directory listings. Also used outside of net/).
- 'sources!': [
- 'base/directory_lister.cc',
- 'base/directory_lister.h',
- 'url_request/file_protocol_handler.cc',
- 'url_request/file_protocol_handler.h',
- 'url_request/url_request_file_dir_job.cc',
- 'url_request/url_request_file_dir_job.h',
- 'url_request/url_request_file_job.cc',
- 'url_request/url_request_file_job.h',
- ],
- }],
- ['disable_ftp_support==1', {
- 'sources/': [
- ['exclude', '^ftp/'],
- ],
- 'sources!': [
- 'url_request/ftp_protocol_handler.cc',
- 'url_request/ftp_protocol_handler.h',
- 'url_request/url_request_ftp_job.cc',
- 'url_request/url_request_ftp_job.h',
- ],
- }],
- ['enable_built_in_dns==1', {
- 'defines': [
- 'ENABLE_BUILT_IN_DNS',
- ]
- }, { # else
- 'sources!': [
- 'dns/address_sorter_posix.cc',
- 'dns/address_sorter_posix.h',
- 'dns/dns_client.cc',
- ],
- }],
- ['use_openssl==1', {
- 'sources!': [
- 'base/crypto_module_nss.cc',
- 'base/keygen_handler_nss.cc',
- 'base/nss_memio.c',
- 'base/nss_memio.h',
- 'cert/cert_database_nss.cc',
- 'cert/cert_verify_proc_nss.cc',
- 'cert/cert_verify_proc_nss.h',
- 'cert/ct_log_verifier_nss.cc',
- 'cert/ct_objects_extractor_nss.cc',
- 'cert/jwk_serializer_nss.cc',
- 'cert/nss_cert_database.cc',
- 'cert/nss_cert_database.h',
- 'cert/nss_cert_database_chromeos.cc',
- 'cert/nss_cert_database_chromeos.h',
- 'cert/nss_profile_filter_chromeos.cc',
- 'cert/nss_profile_filter_chromeos.h',
- 'cert/scoped_nss_types.h',
- 'cert/sha256_legacy_support_nss_win.cc',
- 'cert/test_root_certs_nss.cc',
- 'cert/x509_certificate_nss.cc',
- 'cert/x509_util_nss.cc',
- 'cert/x509_util_nss.h',
- 'ocsp/nss_ocsp.cc',
- 'ocsp/nss_ocsp.h',
- 'quic/crypto/aead_base_decrypter_nss.cc',
- 'quic/crypto/aead_base_encrypter_nss.cc',
- 'quic/crypto/aes_128_gcm_12_decrypter_nss.cc',
- 'quic/crypto/aes_128_gcm_12_encrypter_nss.cc',
- 'quic/crypto/chacha20_poly1305_decrypter_nss.cc',
- 'quic/crypto/chacha20_poly1305_encrypter_nss.cc',
- 'quic/crypto/channel_id_nss.cc',
- 'quic/crypto/p256_key_exchange_nss.cc',
- 'socket/nss_ssl_util.cc',
- 'socket/nss_ssl_util.h',
- 'socket/ssl_client_socket_nss.cc',
- 'socket/ssl_client_socket_nss.h',
- 'socket/ssl_server_socket_nss.cc',
- 'socket/ssl_server_socket_nss.h',
- 'third_party/mozilla_security_manager/nsKeygenHandler.cpp',
- 'third_party/mozilla_security_manager/nsKeygenHandler.h',
- 'third_party/mozilla_security_manager/nsNSSCertificateDB.cpp',
- 'third_party/mozilla_security_manager/nsNSSCertificateDB.h',
- 'third_party/mozilla_security_manager/nsPKCS12Blob.cpp',
- 'third_party/mozilla_security_manager/nsPKCS12Blob.h',
- ],
- 'dependencies': [
- '../third_party/boringssl/boringssl.gyp:boringssl',
- ],
- },
- { # else !use_openssl: remove the unneeded files and depend on NSS.
- 'sources!': [
- 'base/crypto_module_openssl.cc',
- 'cert/ct_log_verifier_openssl.cc',
- 'cert/ct_objects_extractor_openssl.cc',
- 'cert/jwk_serializer_openssl.cc',
- 'cert/sha256_legacy_support_openssl_win.cc',
- 'cert/x509_util_openssl.cc',
- 'cert/x509_util_openssl.h',
- 'quic/crypto/aead_base_decrypter_openssl.cc',
- 'quic/crypto/aead_base_encrypter_openssl.cc',
- 'quic/crypto/aes_128_gcm_12_decrypter_openssl.cc',
- 'quic/crypto/aes_128_gcm_12_encrypter_openssl.cc',
- 'quic/crypto/chacha20_poly1305_decrypter_openssl.cc',
- 'quic/crypto/chacha20_poly1305_encrypter_openssl.cc',
- 'quic/crypto/channel_id_openssl.cc',
- 'quic/crypto/p256_key_exchange_openssl.cc',
- 'quic/crypto/scoped_evp_aead_ctx.cc',
- 'quic/crypto/scoped_evp_aead_ctx.h',
- 'socket/ssl_client_socket_openssl.cc',
- 'socket/ssl_client_socket_openssl.h',
- 'socket/ssl_server_socket_openssl.cc',
- 'socket/ssl_server_socket_openssl.h',
- 'socket/ssl_session_cache_openssl.cc',
- 'socket/ssl_session_cache_openssl.h',
- 'ssl/openssl_platform_key.h',
- 'ssl/openssl_platform_key_mac.cc',
- 'ssl/openssl_platform_key_win.cc',
- 'ssl/openssl_ssl_util.cc',
- 'ssl/openssl_ssl_util.h',
- ],
- 'conditions': [
- # Pull in the bundled or system NSS as appropriate.
- [ 'desktop_linux == 1 or chromeos == 1', {
- 'dependencies': [
- '../build/linux/system.gyp:ssl',
- ],
- }, {
- 'dependencies': [
- '../third_party/nss/nss.gyp:nspr',
- '../third_party/nss/nss.gyp:nss',
- 'third_party/nss/ssl.gyp:libssl',
- ],
- }]
- ],
- },
- ],
- [ 'use_openssl_certs == 0', {
- 'sources!': [
- 'base/keygen_handler_openssl.cc',
- 'base/openssl_private_key_store.h',
- 'base/openssl_private_key_store_android.cc',
- 'base/openssl_private_key_store_memory.cc',
- 'cert/cert_database_openssl.cc',
- 'cert/cert_verify_proc_openssl.cc',
- 'cert/cert_verify_proc_openssl.h',
- 'cert/test_root_certs_openssl.cc',
- 'cert/x509_certificate_openssl.cc',
- 'ssl/openssl_client_key_store.cc',
- 'ssl/openssl_client_key_store.h',
- ],
- }],
- [ 'use_glib == 1', {
- 'dependencies': [
- '../build/linux/system.gyp:gconf',
- '../build/linux/system.gyp:gio',
- ],
- }],
- [ 'desktop_linux == 1 or chromeos == 1', {
- 'conditions': [
- ['os_bsd==1', {
- 'sources!': [
- 'base/network_change_notifier_linux.cc',
- 'base/network_change_notifier_netlink_linux.cc',
- 'proxy/proxy_config_service_linux.cc',
- ],
- },{
- 'dependencies': [
- '../build/linux/system.gyp:libresolv',
- ],
- }],
- ['OS=="solaris"', {
- 'link_settings': {
- 'ldflags': [
- '-R/usr/lib/mps',
- ],
- },
- }],
- ],
- },
- { # else: OS is not in the above list
- 'sources!': [
- 'base/crypto_module_nss.cc',
- 'base/keygen_handler_nss.cc',
- 'cert/cert_database_nss.cc',
- 'cert/nss_cert_database.cc',
- 'cert/nss_cert_database.h',
- 'cert/test_root_certs_nss.cc',
- 'cert/x509_certificate_nss.cc',
- 'ocsp/nss_ocsp.cc',
- 'ocsp/nss_ocsp.h',
- 'third_party/mozilla_security_manager/nsKeygenHandler.cpp',
- 'third_party/mozilla_security_manager/nsKeygenHandler.h',
- 'third_party/mozilla_security_manager/nsNSSCertificateDB.cpp',
- 'third_party/mozilla_security_manager/nsNSSCertificateDB.h',
- 'third_party/mozilla_security_manager/nsPKCS12Blob.cpp',
- 'third_party/mozilla_security_manager/nsPKCS12Blob.h',
- ],
- },
- ],
- [ 'use_nss != 1', {
- 'sources!': [
- 'cert/cert_verify_proc_nss.cc',
- 'cert/cert_verify_proc_nss.h',
- 'ssl/client_cert_store_chromeos.cc',
- 'ssl/client_cert_store_chromeos.h',
- 'ssl/client_cert_store_nss.cc',
- 'ssl/client_cert_store_nss.h',
- ],
- }],
- [ 'enable_websockets != 1', {
- 'sources/': [
- ['exclude', '^websockets/'],
- ],
- }],
- [ 'enable_mdns != 1', {
- 'sources!' : [
- 'dns/mdns_cache.cc',
- 'dns/mdns_cache.h',
- 'dns/mdns_client.cc',
- 'dns/mdns_client.h',
- 'dns/mdns_client_impl.cc',
- 'dns/mdns_client_impl.h',
- 'dns/record_parsed.cc',
- 'dns/record_parsed.h',
- 'dns/record_rdata.cc',
- 'dns/record_rdata.h',
- ]
- }],
- [ 'OS == "win"', {
- 'sources!': [
- 'http/http_auth_handler_ntlm_portable.cc',
- 'socket/socket_libevent.cc',
- 'socket/socket_libevent.h',
- 'socket/tcp_socket_libevent.cc',
- 'socket/tcp_socket_libevent.h',
- 'udp/udp_socket_libevent.cc',
- 'udp/udp_socket_libevent.h',
- ],
- # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
- 'msvs_disabled_warnings': [4267, ],
- }, { # else: OS != "win"
- 'sources!': [
- 'base/winsock_init.cc',
- 'base/winsock_init.h',
- 'base/winsock_util.cc',
- 'base/winsock_util.h',
- 'proxy/proxy_resolver_winhttp.cc',
- 'proxy/proxy_resolver_winhttp.h',
- ],
- },
- ],
- [ 'OS == "mac"', {
- 'link_settings': {
- 'libraries': [
- '$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
- '$(SDKROOT)/System/Library/Frameworks/Security.framework',
- '$(SDKROOT)/System/Library/Frameworks/SystemConfiguration.framework',
- '$(SDKROOT)/usr/lib/libresolv.dylib',
- ]
- },
- },
- ],
- [ 'OS == "ios"', {
- 'sources!': [
- 'disk_cache/blockfile/file_posix.cc',
- ],
- 'link_settings': {
- 'libraries': [
- '$(SDKROOT)/System/Library/Frameworks/CFNetwork.framework',
- '$(SDKROOT)/System/Library/Frameworks/MobileCoreServices.framework',
- '$(SDKROOT)/System/Library/Frameworks/Security.framework',
- '$(SDKROOT)/System/Library/Frameworks/SystemConfiguration.framework',
- '$(SDKROOT)/usr/lib/libresolv.dylib',
- ],
- },
- },
- ],
- [ 'OS == "ios" or OS == "mac"', {
- 'sources': [
- '<@(net_base_mac_ios_sources)',
- ],
- },
- ],
- ['OS=="android" and _toolset=="target" and android_webview_build == 0', {
- 'dependencies': [
- 'net_java',
- ],
- }],
- [ 'OS == "android"', {
- 'dependencies': [
- 'net_jni_headers',
- ],
- 'sources!': [
- 'base/openssl_private_key_store_memory.cc',
- 'cert/cert_database_openssl.cc',
- 'cert/cert_verify_proc_openssl.cc',
- 'cert/test_root_certs_openssl.cc',
- ],
- },
- ],
- [ 'use_icu_alternatives_on_android == 1', {
- 'dependencies!': [
- '../base/base.gyp:base_i18n',
- '../third_party/icu/icu.gyp:icui18n',
- '../third_party/icu/icu.gyp:icuuc',
- ],
- 'sources!': [
- 'base/filename_util_icu.cc',
- 'base/net_string_util_icu.cc',
- 'base/net_util_icu.cc',
- ],
- 'sources': [
- 'base/net_string_util_icu_alternatives_android.cc',
- 'base/net_string_util_icu_alternatives_android.h',
- ],
- },
- ],
- ],
- 'target_conditions': [
- # These source files are excluded by default platform rules, but they
- # are needed in specific cases on other platforms. Re-including them can
- # only be done in target_conditions as it is evaluated after the
- # platform rules.
- ['OS == "android"', {
- 'sources/': [
- ['include', '^base/platform_mime_util_linux\\.cc$'],
- ['include', '^base/address_tracker_linux\\.cc$'],
- ['include', '^base/address_tracker_linux\\.h$'],
- ['include', '^base/net_util_linux\\.cc$'],
- ['include', '^base/net_util_linux\\.h$'],
- ],
- }],
- ['OS == "ios"', {
- 'sources/': [
- ['include', '^base/net_util_mac\\.cc$'],
- ['include', '^base/net_util_mac\\.h$'],
- ['include', '^base/network_change_notifier_mac\\.cc$'],
- ['include', '^base/network_config_watcher_mac\\.cc$'],
- ['include', '^base/platform_mime_util_mac\\.mm$'],
- # The iOS implementation only partially uses NSS and thus does not
- # defines |use_nss|. In particular the |USE_NSS| preprocessor
- # definition is not used. The following files are needed though:
- ['include', '^cert/cert_verify_proc_nss\\.cc$'],
- ['include', '^cert/cert_verify_proc_nss\\.h$'],
- ['include', '^cert/test_root_certs_nss\\.cc$'],
- ['include', '^cert/x509_util_nss\\.cc$'],
- ['include', '^cert/x509_util_nss\\.h$'],
- ['include', '^proxy/proxy_resolver_mac\\.cc$'],
- ['include', '^proxy/proxy_server_mac\\.cc$'],
- ['include', '^ocsp/nss_ocsp\\.cc$'],
- ['include', '^ocsp/nss_ocsp\\.h$'],
- ],
- }],
- ],
+ 'includes': [ 'net_common.gypi' ],
},
{
'target_name': 'net_unittests',
@@ -1632,6 +1196,28 @@
}],
['OS=="android"', {
'targets': [
+ { # The same target as 'net', but with smaller binary size due to exclusion
+ # of ICU, FTP, FILE and WebSockets support.
+ 'target_name': 'net_small',
mmenke 2015/02/25 16:34:54 I'm confused. How does this actually work in term
Torne 2015/02/25 16:46:06 The object files are either in a directory named a
mmenke 2015/02/25 16:48:03 Ahh...you're right. Didn't notice the object file
+ 'variables': {
+ 'disable_ftp_support': 1,
+ 'disable_file_support': 1,
+ 'enable_websockets': 0,
+ 'use_icu_alternatives_on_android': 1,
+ },
+ 'dependencies': [
+ '../url/url.gyp:url_lib_use_icu_alternatives_on_android',
+ ],
+ 'dependencies!': [
+ '../url/url.gyp:url_lib',
+ ],
mmenke 2015/02/25 16:34:54 Rather than exclude stuff here, think it makes mor
mef 2015/02/26 21:22:51 Done. I've also moved items that depend on use_icu
+ 'defines': [
+ 'USE_ICU_ALTERNATIVES_ON_ANDROID=1',
+ 'DISABLE_FILE_SUPPORT=1',
+ 'DISABLE_FTP_SUPPORT=1',
+ ],
+ 'includes': [ 'net_common.gypi' ],
+ },
{
'target_name': 'net_jni_headers',
'type': 'none',
@@ -1641,6 +1227,7 @@
'android/java/src/org/chromium/net/AndroidNetworkLibrary.java',
'android/java/src/org/chromium/net/AndroidPrivateKey.java',
'android/java/src/org/chromium/net/GURLUtils.java',
+ 'android/java/src/org/chromium/net/NetStringUtil.java',
'android/java/src/org/chromium/net/NetworkChangeNotifier.java',
'android/java/src/org/chromium/net/ProxyChangeListener.java',
'android/java/src/org/chromium/net/X509Util.java',
@@ -1649,14 +1236,6 @@
'jni_gen_package': 'net',
},
'includes': [ '../build/jni_generator.gypi' ],
-
- 'conditions': [
- ['use_icu_alternatives_on_android==1', {
- 'sources': [
- 'android/java/src/org/chromium/net/NetStringUtil.java',
- ],
- }],
- ],
},
{
'target_name': 'net_test_jni_headers',
« components/cronet.gypi ('K') | « components/cronet/cronet_static.gypi ('k') | net/net_common.gypi » ('j') | net/net_common.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698