Chromium Code Reviews| Index: net/net.gyp |
| diff --git a/net/net.gyp b/net/net.gyp |
| index 308c98d2be0d7bf94dba92d7eb82e279263f097a..f9853b9b5f6c4874e755defee05b7129a05e5dfb 100644 |
| --- a/net/net.gyp |
| +++ b/net/net.gyp |
| @@ -3197,5 +3197,157 @@ |
| }, |
| ], |
| }], |
| + ['OS=="android"', { |
|
mmenke
2014/03/07 16:24:29
Wonder if this should go in its own file. Fine fo
mef
2014/03/07 18:14:21
Added TODO(mef).
|
| + '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', |
| + '../base/base.gyp:base_i18n', |
| + '../third_party/icu/icu.gyp:icui18n', |
| + '../third_party/icu/icu.gyp:icuuc', |
| + '../url/url.gyp:url_lib', |
| + '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\\"', |
| + '-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.>(android_product_extension)', |
| + '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' ], |
| + }, |
| + { |
| + # cronet_sample_apk creates a .jar as a side effect. Any java targets |
| + # that need that .jar in their classpath should depend on this target, |
| + # cronet_sample_apk_java. Dependents of cronet_sample_apk receive its |
| + # jar path in the variable 'apk_output_jar_path'. This target should |
| + # only be used by targets which instrument cronet_sample_apk. |
| + 'target_name': 'cronet_sample_apk_java', |
| + 'type': 'none', |
| + 'dependencies': [ |
| + 'cronet_sample_apk', |
| + ], |
| + 'includes': [ '../build/apk_fake_jar.gypi' ], |
| + }, |
| + { |
| + 'target_name': 'cronet_sample_test_apk', |
| + 'type': 'none', |
| + 'dependencies': [ |
| + 'cronet_sample_apk_java', |
| + '../base/base.gyp:base_java', |
| + '../base/base.gyp:base_javatests', |
| + '../base/base.gyp:base_java_test_support', |
| + # TODO(mef): Figure out why some tests are failing. |
| + #'../net/net.gyp:net_javatests', |
| + #'../net/net.gyp:net_java_test_support', |
| + ], |
| + 'variables': { |
| + 'apk_name': 'CronetSampleTest', |
| + 'java_in_dir': 'cronet/android/sample/javatests', |
| + 'resource_dir': 'cronet/android/sample/res', |
| + 'is_test_apk': 1, |
| + }, |
| + 'includes': [ '../build/java_apk.gypi' ], |
| + }, |
| + ], |
| + }], # OS=="android" |
| ], |
| } |