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

Unified Diff: net/net.gyp

Issue 145213003: Initial upload of cronet for Android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Added cronet_package target to copy cronet.jar and stripped libcronet.so Created 6 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
Index: net/net.gyp
diff --git a/net/net.gyp b/net/net.gyp
index f4997585c7f63be3aeef42154ec33e853c0c1ae6..c1466086e704ea9c3388288a0a95711d08aacc53 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -3180,5 +3180,120 @@
},
],
}],
+ ['OS=="android"', {
+ 'targets': [
+ {
+ 'target_name': 'cronet_jni_headers',
+ 'type': 'none',
+ 'sources': [
+ 'cronet/android/java/src/org/chromium/net/UrlRequest.java',
+ 'cronet/android/java/src/org/chromium/net/UrlRequestContext.java',
+ ],
+ 'variables': {
+ 'jni_gen_package': 'cronet',
+ 'jni_generator_ptr_type': 'long',
+ },
+ 'includes': [ '../build/jni_generator.gypi' ],
+ },
+ {
+ 'target_name': 'libcronet',
+ 'type': 'shared_library',
+ 'dependencies': [
+ '../base/base.gyp:base',
+ 'cronet_jni_headers',
+ 'net',
+ ],
+ 'sources': [
+ 'cronet/android/org_chromium_net_UrlRequest.cc',
+ 'cronet/android/org_chromium_net_UrlRequest.h',
+ 'cronet/android/org_chromium_net_UrlRequestContext.cc',
+ 'cronet/android/org_chromium_net_UrlRequestContext.h',
+ 'cronet/android/url_request_context_peer.cc',
+ 'cronet/android/url_request_context_peer.h',
+ 'cronet/android/url_request_peer.cc',
+ 'cronet/android/url_request_peer.h',
+ ],
+ 'cflags': [
+ # TODO(mef): Figure out a good way to get version from chrome_version_info_posix.h.
+ '-DCHROMIUM_VERSION=\\"TBD\\"',
mef 2014/02/04 21:14:11 What's a good way to define CHROMIUM_VERSION? Norm
+ '-DLOGGING=1',
+ '-fdata-sections',
+ '-ffunction-sections',
+ '-fno-rtti',
+ '-fvisibility=hidden',
+ '-fvisibility-inlines-hidden',
+ '-Wno-sign-promo',
+ '-Wno-missing-field-initializers',
+ ],
+ 'ldflags': [
+ '-llog',
+ '-landroid',
+ '-Wl,--gc-sections',
+ '-Wl,--exclude-libs,ALL'
+ ]
+ },
+ {
+ 'target_name': 'cronet',
+ 'type': 'none',
+ 'dependencies': [
+ '../base/base.gyp:base',
+ 'libcronet',
+ ],
+ 'variables': {
+ 'java_in_dir': 'cronet/android/java',
+ },
+ 'includes': [ '../build/java.gypi' ],
+ },
+ {
+ 'target_name': 'cronet_package',
+ 'type': 'none',
+ 'dependencies': [
+ 'libcronet',
+ 'cronet',
+ ],
+ 'variables': {
+ 'native_lib': 'libcronet.so',
+ 'java_lib': 'cronet.jar',
+ 'package_dir': '<(PRODUCT_DIR)/cronet',
+ },
+ 'actions': [
+ {
+ 'action_name': 'strip libcronet',
+ 'inputs': ['<(SHARED_LIB_DIR)/<(native_lib)'],
+ 'outputs': ['<(package_dir)/libs/<(android_app_abi)/<(native_lib)'],
+ 'action': [
+ '<(android_strip)',
+ '--strip-unneeded',
+ '<@(_inputs)',
+ '-o',
+ '<@(_outputs)',
+ ],
+ },
+ ],
+ 'copies': [
+ {
+ 'destination': '<(package_dir)',
+ 'files': [
+ '<(PRODUCT_DIR)/lib.java/<(java_lib)',
+ ],
+ },
+ ],
+ },
+ {
+ 'target_name': 'cronet_sample_apk',
+ 'type': 'none',
+ 'dependencies': [
+ 'cronet',
+ ],
+ 'variables': {
+ 'apk_name': 'CronetSample',
+ 'java_in_dir': 'cronet/android/sample',
+ 'resource_dir': 'cronet/android/sample/res',
+ 'native_lib_target': 'libcronet',
+ },
+ 'includes': [ '../build/java_apk.gypi' ],
+ }
+ ],
+ }], # OS=="android"
],
}

Powered by Google App Engine
This is Rietveld 408576698