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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: android_webview/android_webview.gyp

Issue 10959018: Simplify android_webview apk generation gyp rules. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 3 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 | « no previous file | android_webview/java/android_webview_apk.xml » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: android_webview/android_webview.gyp
diff --git a/android_webview/android_webview.gyp b/android_webview/android_webview.gyp
index cb303f902f70969168f4be83ba715d388d4991ce..174a67469b6bbb8caf80227591c424cb541551c5 100644
--- a/android_webview/android_webview.gyp
+++ b/android_webview/android_webview.gyp
@@ -94,250 +94,74 @@
'includes': [ '../build/java.gypi' ],
},
{
- 'target_name': 'android_webview_javatests',
+ 'target_name': 'android_webview_apk',
'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)/base/base.gyp:base_java',
'<(DEPTH)/chrome/browser/component/components.gyp:web_contents_delegate_android_java',
+ '<(DEPTH)/chrome/chrome_resources.gyp:packed_extra_resources',
+ '<(DEPTH)/chrome/chrome_resources.gyp:packed_resources',
+ '<(DEPTH)/content/content.gyp:content_java',
+ '<(DEPTH)/media/media.gyp:media_java',
+ '<(DEPTH)/net/net.gyp:net_java',
+ '<(DEPTH)/ui/ui.gyp:ui_java',
+ 'libwebview',
],
'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_ui_jar',
- 'inputs': ['<(PRODUCT_DIR)/lib.java/chromium_ui.jar'],
- 'outputs': ['<(PRODUCT_DIR)/android_webview/java/libs/chromium_ui.jar'],
- 'action': ['cp', '<@(_inputs)', '<@(_outputs)'],
- },
- # TODO: This should be removed once we stop sharing the chrome/ layer JNI
- # registration code. We currently include this because we reuse the
- # chrome/ layer JNI registration code (which will crash if these classes
- # are not present in the APK).
- {
- 'action_name': 'copy_chrome_jar',
- 'inputs': ['<(PRODUCT_DIR)/lib.java/chromium_chrome.jar'],
- 'outputs': ['<(PRODUCT_DIR)/android_webview/java/libs/chromium_chrome.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-US.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',
- '<(PRODUCT_DIR)/android_webview/java/libs/chromium_chrome.jar',
- '<(PRODUCT_DIR)/android_webview/java/libs/chromium_ui.jar',
+ 'package_name': 'android_webview',
+ 'apk_name': 'AndroidWebView',
+ 'java_in_dir': '<(DEPTH)/android_webview/java',
+ # TODO(cjhopman): The resource directory of all apks should be in
+ # <java_in_dir>/res.
+ 'resource_dir': '../res',
+ 'native_libs_paths': ['<(PRODUCT_DIR)/android_webview/libs/<(android_app_abi)/libwebview.so'],
+ 'additional_input_paths': [
'<(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_GDBSERVER=<(android_gdbserver)',
- '-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',
- ],
- }
+ ],
cjhopman 2012/09/20 18:40:34 Line 123 should have same indent as 118.
mkosiba (inactive) 2012/09/21 09:53:39 Done.
+ },
+ 'actions': [
+ {
+ 'action_name': 'copy_and_strip_so',
+ 'inputs': ['<(SHARED_LIB_DIR)/libwebview.so'],
+ 'outputs': ['<(PRODUCT_DIR)/android_webview/libs/<(android_app_abi)/libwebview.so'],
+ 'action': [
+ '<(android_strip)',
cjhopman 2012/09/20 18:40:34 Lines 131-135 are indented an extra level.
mkosiba (inactive) 2012/09/21 09:53:39 Done.
+ '--strip-unneeded', # All symbols not needed for relocation.
+ '<@(_inputs)',
+ '-o',
+ '<@(_outputs)',
+ ],
+ },
],
+ 'includes': [ '../build/java_apk.gypi' ],
},
{
'target_name': 'android_webview_test_apk',
'type': 'none',
'dependencies': [
- 'android_webview_apk',
+ '<(DEPTH)/base/base.gyp:base_java',
cjhopman 2012/09/20 18:40:34 According to https://groups.google.com/a/chromium.
mkosiba (inactive) 2012/09/21 09:53:39 Done.
+ '<(DEPTH)/base/base.gyp:base_java_test_support',
+ '<(DEPTH)/chrome/browser/component/components.gyp:web_contents_delegate_android_java',
+ '<(DEPTH)/chrome/chrome_resources.gyp:packed_extra_resources',
+ '<(DEPTH)/chrome/chrome_resources.gyp:packed_resources',
+ '<(DEPTH)/content/content.gyp:content_java',
'<(DEPTH)/content/content.gyp:content_javatests',
+ '<(DEPTH)/media/media.gyp:media_java',
+ '<(DEPTH)/net/net.gyp:net_java',
+ '<(DEPTH)/ui/ui.gyp:ui_java',
+ 'android_webview_java',
+ 'libwebview',
],
- '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_ui_jar',
- 'inputs': ['<(PRODUCT_DIR)/lib.java/chromium_ui.jar'],
- 'outputs': ['<(PRODUCT_DIR)/android_webview_test/java/libs/chromium_ui.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/AndroidWebViewTest-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_GDBSERVER=<(android_gdbserver)',
- '-buildfile',
- '<(DEPTH)/android_webview/javatests/android_webview_test_apk.xml',
- ]
- }
- ],
+ 'variables': {
+ 'package_name': 'android_webview_test',
+ 'apk_name': 'AndroidWebViewTest',
+ 'java_in_dir': '<(DEPTH)/android_webview/javatests',
+ 'resource_dir': '../res',
+ },
+ 'includes': [ '../build/java_apk.gypi' ],
},
],
}
« no previous file with comments | « no previous file | android_webview/java/android_webview_apk.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698