Index: net/net.gyp |
diff --git a/net/net.gyp b/net/net.gyp |
index 1749a46246ba395b797266bc7b442453c56bfc56..a6212e1d255a6525cafadd2ab41f4c1c41da70f4 100644 |
--- a/net/net.gyp |
+++ b/net/net.gyp |
@@ -1372,7 +1372,7 @@ |
'type': 'none', |
'sources': [ |
'android/javatests/src/org/chromium/net/AndroidKeyStoreTestUtil.java', |
- 'test/android/javatests/src/org/chromium/net/test/EmbeddedTestServer.java', |
+ 'test/android/javatests/src/org/chromium/net/test/EmbeddedTestServerImpl.java', |
'test/android/javatests/src/org/chromium/net/test/DummySpnegoAuthenticator.java', |
], |
'variables': { |
@@ -1414,6 +1414,17 @@ |
'includes': [ '../build/java_aidl.gypi' ], |
}, |
{ |
+ 'target_name': 'embedded_test_server_aidl', |
mef
2015/11/25 17:20:21
FWIW I don't think calling this 'embedded' is appr
|
+ 'type': 'none', |
+ 'variables': { |
+ 'aidl_interface_file': '../net/test/android/javatests/src/org/chromium/net/test/IEmbeddedTestServerInterface.aidl', |
+ }, |
+ 'sources': [ |
+ '../net/test/android/javatests/src/org/chromium/net/test/IEmbeddedTestServerImpl.aidl', |
+ ], |
+ 'includes': [ '../build/java_aidl.gypi' ], |
+ }, |
+ { |
'target_name': 'net_java_test_support', |
'type': 'none', |
'variables': { |
@@ -1422,15 +1433,66 @@ |
'chromium_code': 0, |
}, |
'dependencies': [ |
+ 'embedded_test_server_aidl', |
'net_java', |
- 'net_test_support', |
'url_request_failed_job_java', |
'../base/base.gyp:base_java', |
+ '../base/base.gyp:base_java_test_support', |
'../third_party/android_tools/android_tools.gyp:legacy_http_javalib', |
], |
'includes': [ '../build/java.gypi' ], |
}, |
{ |
+ 'target_name': 'libnet_java_test_support', |
+ 'type': 'shared_library', |
+ 'dependencies': [ |
+ 'net_test_support', |
+ '../base/base.gyp:base', |
+ ], |
+ 'sources': [ |
+ 'test/android/net_test_entry_point.cc', |
+ ], |
+ }, |
+ { |
+ 'target_name': 'net_test_support_apk', |
+ 'type': 'none', |
+ 'dependencies': [ |
+ 'net_java_test_support', |
+ ], |
+ 'variables': { |
+ 'android_manifest_path': 'test/android/javatests/AndroidManifest.xml', |
+ 'apk_name': 'ChromiumNetTestSupport', |
mef
2015/11/25 17:20:21
Do we expect something in addition to embedded_tes
|
+ 'is_test_apk': 1, |
+ 'java_in_dir': 'test/android/javatests', |
+ 'java_in_dir_suffix': '/src_dummy', |
+ 'native_lib_target': 'libnet_java_test_support', |
+ }, |
+ 'includes': [ |
+ '../build/java_apk.gypi', |
+ ], |
+ }, |
+ { |
+ 'target_name': 'require_net_test_support_apk', |
mef
2015/11/25 17:20:21
what does this target do?
|
+ 'type': 'none', |
+ 'actions': [ |
+ { |
+ 'action_name': 'require_ChromiumNetTestSupport', |
+ 'variables': { |
+ 'required_file': '<(PRODUCT_DIR)/net_test_support_apk/ChromiumNetTestSupport.apk.required', |
+ }, |
+ 'inputs': [ |
+ '<(PRODUCT_DIR)/apks/ChromiumNetTestSupport.apk', |
+ ], |
+ 'outputs': [ |
+ '<(required_file)', |
+ ], |
+ 'action': [ |
+ 'python', '../build/android/gyp/touch.py', '<(required_file)', |
+ ], |
+ }, |
+ ], |
+ }, |
+ { |
'target_name': 'url_request_failed_job_java', |
'type': 'none', |
'variables': { |