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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: android_webview/lib/android_webview.gyp

Issue 10855171: Add a test runner for android_webview. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: address feedback Created 8 years, 4 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
« no previous file with comments | « android_webview/lib/DEPS ('k') | android_webview/lib/aw_browser_dependency_factory_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: android_webview/lib/android_webview.gyp
diff --git a/android_webview/lib/android_webview.gyp b/android_webview/lib/android_webview.gyp
index 8cd34eec41f3ab1d9df4669d8c6cb9c4b1bcd288..aea913fc2fddcde7464aa96e2fbed39ffb41efa8 100644
--- a/android_webview/lib/android_webview.gyp
+++ b/android_webview/lib/android_webview.gyp
@@ -10,21 +10,30 @@
'target_name': 'libwebview',
'type': 'shared_library',
'dependencies': [
- '../../chrome/chrome.gyp:browser',
- '../../chrome/chrome.gyp:renderer',
- '../../content/content.gyp:content',
- '../native/webview_native.gyp:webview_native',
+ '<(DEPTH)/chrome/chrome.gyp:browser',
+ '<(DEPTH)/chrome/chrome.gyp:renderer',
+ '<(DEPTH)/content/content.gyp:content',
+ '<(DEPTH)/android_webview/native/webview_native.gyp:webview_native',
+ '<(DEPTH)/chrome/browser/component/components.gyp:web_contents_delegate_android',
+ '<(DEPTH)/chrome/browser/component/components.gyp:browser_component_jni_headers',
],
'include_dirs': [
'../..',
'../../skia/config',
],
'sources': [
+ 'aw_browser_dependency_factory_impl.cc',
+ 'aw_browser_dependency_factory_impl.h',
+ 'aw_content_browser_client.cc',
+ 'aw_content_browser_client.h',
'main/webview_entry_point.cc',
'main/webview_main_delegate.cc',
'main/webview_main_delegate.h',
'main/webview_stubs.cc',
],
+ 'includes': [
+ '../aw_browser.gypi',
+ ],
},
{
'target_name': 'android_webview',
@@ -54,11 +63,240 @@
},
],
},
+ {
+ 'target_name': 'android_webview_java',
+ 'type': 'none',
+ 'dependencies': [
+ '<(DEPTH)/content/content.gyp:content_java',
+ '<(DEPTH)/chrome/browser/component/components.gyp:web_contents_delegate_android_java',
+ ],
+ 'variables': {
+ 'package_name': 'android_webview_java',
+ 'java_in_dir': '<(DEPTH)/android_webview/java',
+ },
+ 'includes': [ '../../build/java.gypi' ],
+ },
+ {
+ 'target_name': 'android_webview_javatests',
+ 'type': 'none',
+ 'dependencies': [
+ 'android_webview_java',
+ '<(DEPTH)/base/base.gyp:base_java_test_support',
+ '<(DEPTH)/content/content.gyp:content_java',
+ '<(DEPTH)/content/content.gyp:content_javatests',
+ '<(DEPTH)/chrome/browser/component/components.gyp:web_contents_delegate_android_java',
+ ],
+ 'variables': {
+ 'package_name': 'android_webview_javatests',
+ 'java_in_dir': '<(DEPTH)/android_webview/javatests',
+ },
+ 'includes': [ '../../build/java.gypi' ],
+ },
+
+ {
+ 'target_name': 'android_webview_apk',
+ 'type': 'none',
+ 'actions': [
+ {
+ 'action_name': 'copy_base_jar',
+ 'inputs': ['<(PRODUCT_DIR)/lib.java/chromium_base.jar'],
+ 'outputs': ['<(PRODUCT_DIR)/android_webview/java/libs/chromium_base.jar'],
+ 'action': ['cp', '<@(_inputs)', '<@(_outputs)'],
+ },
+ {
+ 'action_name': 'copy_net_jar',
+ 'inputs': ['<(PRODUCT_DIR)/lib.java/chromium_net.jar'],
+ 'outputs': ['<(PRODUCT_DIR)/android_webview/java/libs/chromium_net.jar'],
+ 'action': ['cp', '<@(_inputs)', '<@(_outputs)'],
+ },
+ {
+ 'action_name': 'copy_media_jar',
+ 'inputs': ['<(PRODUCT_DIR)/lib.java/chromium_media.jar'],
+ 'outputs': ['<(PRODUCT_DIR)/android_webview/java/libs/chromium_media.jar'],
+ 'action': ['cp', '<@(_inputs)', '<@(_outputs)'],
+ },
+ {
+ 'action_name': 'copy_content_jar',
+ 'inputs': ['<(PRODUCT_DIR)/lib.java/chromium_content.jar'],
+ 'outputs': ['<(PRODUCT_DIR)/android_webview/java/libs/chromium_content.jar'],
+ 'action': ['cp', '<@(_inputs)', '<@(_outputs)'],
+ },
+ {
+ 'action_name': 'copy_web_contents_delegate_android_java',
+ 'inputs': ['<(PRODUCT_DIR)/lib.java/chromium_web_contents_delegate_android.jar'],
+ 'outputs': ['<(PRODUCT_DIR)/android_webview/java/libs/chromium_web_contents_delegate_android.jar'],
+ 'action': ['cp', '<@(_inputs)', '<@(_outputs)'],
+ },
+ {
+ 'action_name': 'copy_android_webview_jar',
+ 'inputs': ['<(PRODUCT_DIR)/lib.java/chromium_android_webview_java.jar'],
+ 'outputs': ['<(PRODUCT_DIR)/android_webview/java/libs/chromium_android_webview_java.jar'],
+ 'action': ['cp', '<@(_inputs)', '<@(_outputs)'],
+ },
+ {
+ 'action_name': 'copy_android_webview_test_jar',
+ 'inputs': ['<(PRODUCT_DIR)/lib.java/chromium_android_webview_javatests.jar'],
+ 'outputs': ['<(PRODUCT_DIR)/android_webview/java/libs/chromium_android_webview_javatests.jar'],
+ 'action': ['cp', '<@(_inputs)', '<@(_outputs)'],
+ },
+ {
+ 'action_name': 'copy_chrome_pak',
+ 'inputs': ['<(SHARED_INTERMEDIATE_DIR)/repack/chrome.pak'],
+ 'outputs': ['<(PRODUCT_DIR)/android_webview/assets/chrome.pak'],
+ 'action': ['cp', '<@(_inputs)', '<@(_outputs)'],
+ },
+ {
+ 'action_name': 'copy_chrome_100_percent_pak',
+ 'inputs': ['<(SHARED_INTERMEDIATE_DIR)/repack/chrome_100_percent.pak'],
+ 'outputs': ['<(PRODUCT_DIR)/android_webview/assets/chrome_100_percent.pak'],
+ 'action': ['cp', '<@(_inputs)', '<@(_outputs)'],
+ },
+ {
+ 'action_name': 'copy_resources_pak',
+ 'inputs': ['<(SHARED_INTERMEDIATE_DIR)/repack/resources.pak'],
+ 'outputs': ['<(PRODUCT_DIR)/android_webview/assets/resources.pak'],
+ 'action': ['cp', '<@(_inputs)', '<@(_outputs)'],
+ },
+ {
+ 'action_name': 'copy_en_pak',
+ 'inputs': ['<(SHARED_INTERMEDIATE_DIR)/repack/en-US.pak'],
+ 'outputs': ['<(PRODUCT_DIR)/android_webview/assets/en.pak'],
+ 'action': ['cp', '<@(_inputs)', '<@(_outputs)'],
+ },
+ {
+ 'action_name': 'copy_and_strip_so',
+ 'inputs': ['<(SHARED_LIB_DIR)/libwebview.so'],
+ 'outputs': ['<(PRODUCT_DIR)/android_webview/libs/<(android_app_abi)/libwebview.so'],
+ 'action': [
+ '<!(/bin/echo -n $STRIP)',
+ '--strip-unneeded', # All symbols not needed for relocation.
+ '<@(_inputs)',
+ '-o',
+ '<@(_outputs)',
+ ],
+ },
+ {
+ 'action_name': 'android_webview_apk',
+ 'inputs': [
+ '<(DEPTH)/android_webview/java/android_webview_apk.xml',
+ '<(DEPTH)/android_webview/java/AndroidManifest.xml',
+ '<(PRODUCT_DIR)/android_webview/java/libs/chromium_android_webview_java.jar',
+ '<(PRODUCT_DIR)/android_webview/java/libs/chromium_android_webview_javatests.jar',
+ '<(PRODUCT_DIR)/android_webview/java/libs/chromium_base.jar',
+ '<(PRODUCT_DIR)/android_webview/java/libs/chromium_net.jar',
+ '<(PRODUCT_DIR)/android_webview/java/libs/chromium_media.jar',
+ '<(PRODUCT_DIR)/android_webview/java/libs/chromium_content.jar',
+ '<(SHARED_INTERMEDIATE_DIR)/repack/chrome.pak',
+ '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_100_percent.pak',
+ '<(SHARED_INTERMEDIATE_DIR)/repack/resources.pak',
+ '<(SHARED_INTERMEDIATE_DIR)/repack/en-US.pak',
+ '<(PRODUCT_DIR)/android_webview/libs/<(android_app_abi)/libwebview.so',
+ ],
+ 'outputs': [
+ '<(PRODUCT_DIR)/android_webview/AndroidWebView-debug.apk',
+ ],
+ 'action': [
+ 'ant',
+ '-DPRODUCT_DIR=<(ant_build_out)',
+ '-DAPP_ABI=<(android_app_abi)',
+ '-DANDROID_SDK=<(android_sdk)',
+ '-DANDROID_SDK_ROOT=<(android_sdk_root)',
+ '-DANDROID_SDK_TOOLS=<(android_sdk_tools)',
+ '-DANDROID_SDK_VERSION=<(android_sdk_version)',
+ '-DANDROID_TOOLCHAIN=<(android_toolchain)',
+ '-buildfile',
+ '<(DEPTH)/android_webview/java/android_webview_apk.xml',
+ ],
+ 'dependencies': [
+ 'libwebview',
+ 'android_webview_java',
+ 'android_webview_javatests',
+ '<(DEPTH)/chrome/chrome_resources.gyp:packed_resources',
+ '<(DEPTH)/chrome/chrome_resources.gyp:packed_extra_resources',
+ ],
+ }
+ ],
+ },
+ {
+ 'target_name': 'android_webview_test_apk',
+ 'type': 'none',
+ 'dependencies': [
+ 'android_webview_apk',
+ '<(DEPTH)/content/content.gyp:content_javatests',
+ ],
+ 'actions': [
+ {
+ 'action_name': 'copy_base_jar',
+ 'inputs': ['<(PRODUCT_DIR)/lib.java/chromium_base.jar'],
+ 'outputs': ['<(PRODUCT_DIR)/android_webview_test/java/libs/chromium_base.jar'],
+ 'action': ['cp', '<@(_inputs)', '<@(_outputs)'],
+ },
+ {
+ 'action_name': 'copy_base_javatests_jar',
+ 'inputs': ['<(PRODUCT_DIR)/lib.java/chromium_base_javatests.jar'],
+ 'outputs': ['<(PRODUCT_DIR)/android_webview_test/java/libs/chromium_base_javatests.jar'],
+ 'action': ['cp', '<@(_inputs)', '<@(_outputs)'],
+ },
+ {
+ 'action_name': 'copy_net_jar',
+ 'inputs': ['<(PRODUCT_DIR)/lib.java/chromium_net.jar'],
+ 'outputs': ['<(PRODUCT_DIR)/android_webview_test/java/libs/chromium_net.jar'],
+ 'action': ['cp', '<@(_inputs)', '<@(_outputs)'],
+ },
+ {
+ 'action_name': 'copy_media_jar',
+ 'inputs': ['<(PRODUCT_DIR)/lib.java/chromium_media.jar'],
+ 'outputs': ['<(PRODUCT_DIR)/android_webview_test/java/libs/chromium_media.jar'],
+ 'action': ['cp', '<@(_inputs)', '<@(_outputs)'],
+ },
+ {
+ 'action_name': 'copy_content_jar',
+ 'inputs': ['<(PRODUCT_DIR)/lib.java/chromium_content.jar'],
+ 'outputs': ['<(PRODUCT_DIR)/android_webview_test/java/libs/chromium_content.jar'],
+ 'action': ['cp', '<@(_inputs)', '<@(_outputs)'],
+ },
+ {
+ 'action_name': 'copy_web_contents_delegate_android_java',
+ 'inputs': ['<(PRODUCT_DIR)/lib.java/chromium_web_contents_delegate_android.jar'],
+ 'outputs': ['<(PRODUCT_DIR)/android_webview_test/java/libs/chromium_web_contents_delegate_android.jar'],
+ 'action': ['cp', '<@(_inputs)', '<@(_outputs)'],
+ },
+ {
+ 'action_name': 'copy_content_javatests_jar',
+ 'inputs': ['<(PRODUCT_DIR)/lib.java/chromium_content_javatests.jar'],
+ 'outputs': ['<(PRODUCT_DIR)/android_webview_test/java/libs/chromium_content_javatests.jar'],
+ 'action': ['cp', '<@(_inputs)', '<@(_outputs)'],
+ },
+ {
+ 'action_name': 'copy_android_webview_jar',
+ 'inputs': ['<(PRODUCT_DIR)/lib.java/chromium_android_webview_java.jar'],
+ 'outputs': ['<(PRODUCT_DIR)/android_webview_test/java/libs/chromium_android_webview_java.jar'],
+ 'action': ['cp', '<@(_inputs)', '<@(_outputs)'],
+ },
+ {
+ 'action_name': 'android_webview_test_generate_apk',
+ 'inputs': [
+ '<(DEPTH)/android_webview/javatests/android_webview_test_apk.xml',
+ '<(DEPTH)/android_webview/javatests/AndroidManifest.xml',
+ '<!@(find <(DEPTH)/android_webview/javatests/ -name "*.java")'
+ ],
+ 'outputs': [
+ '<(PRODUCT_DIR)/android_webview_test/ContentShellTest-debug.apk',
+ ],
+ 'action': [
+ 'ant',
+ '-DPRODUCT_DIR=<(ant_build_out)',
+ '-DAPP_ABI=<(android_app_abi)',
+ '-DANDROID_SDK=<(android_sdk)',
+ '-DANDROID_SDK_ROOT=<(android_sdk_root)',
+ '-DANDROID_SDK_TOOLS=<(android_sdk_tools)',
+ '-DANDROID_SDK_VERSION=<(android_sdk_version)',
+ '-DANDROID_TOOLCHAIN=<(android_toolchain)',
+ '-buildfile',
+ '<(DEPTH)/android_webview/javatests/android_webview_test_apk.xml',
+ ]
+ }
+ ],
+ },
],
}
-
-# Local Variables:
-# tab-width:2
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=2 shiftwidth=2:
« no previous file with comments | « android_webview/lib/DEPS ('k') | android_webview/lib/aw_browser_dependency_factory_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698