diff options
| author | cjhopman@chromium.org <cjhopman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-06 01:18:51 +0000 |
|---|---|---|
| committer | cjhopman@chromium.org <cjhopman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-06 01:18:51 +0000 |
| commit | 8511b5ab226e3cecfd9192c15ab38147cd73f93d (patch) | |
| tree | 27eeb426f91f23c1b53d1772c48b7adb145771c6 /content/content_shell.gypi | |
| parent | aafe49a07358889cdf76837465cd79d25874d280 (diff) | |
| download | chromium_src-8511b5ab226e3cecfd9192c15ab38147cd73f93d.zip chromium_src-8511b5ab226e3cecfd9192c15ab38147cd73f93d.tar.gz chromium_src-8511b5ab226e3cecfd9192c15ab38147cd73f93d.tar.bz2 | |
Remove copy steps from content_shell_apk and content_shell_test_apk
The build files should just refer to these jars in lib.java and the
classpath should specify them explicitly rather than grabbing the whole
directory.
Also fix some missing inputs for one of the actions.
BUG=145988
Review URL: https://chromiumcodereview.appspot.com/10907069
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@155085 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/content_shell.gypi')
| -rw-r--r-- | content/content_shell.gypi | 32 |
1 files changed, 4 insertions, 28 deletions
diff --git a/content/content_shell.gypi b/content/content_shell.gypi index 93b4874..17e9444 100644 --- a/content/content_shell.gypi +++ b/content/content_shell.gypi @@ -597,30 +597,6 @@ 'type': 'none', 'actions': [ { - 'action_name': 'copy_base_jar', - 'inputs': ['<(PRODUCT_DIR)/lib.java/chromium_base.jar'], - 'outputs': ['<(PRODUCT_DIR)/content_shell/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)/content_shell/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)/content_shell/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)/content_shell/java/libs/chromium_content.jar'], - 'action': ['cp', '<@(_inputs)', '<@(_outputs)'], - }, - { 'action_name': 'copy_and_strip_so', 'inputs': ['<(SHARED_LIB_DIR)/libcontent_shell_content_view.so'], 'outputs': ['<(PRODUCT_DIR)/content_shell/libs/<(android_app_abi)/libcontent_shell_content_view.so'], @@ -639,10 +615,10 @@ 'shell/android/java/AndroidManifest.xml', '<!@(find shell/android/java -name "*.java")', '<!@(find shell/android/res -name "*")', - '<(PRODUCT_DIR)/content_shell/java/libs/chromium_base.jar', - '<(PRODUCT_DIR)/content_shell/java/libs/chromium_net.jar', - '<(PRODUCT_DIR)/content_shell/java/libs/chromium_media.jar', - '<(PRODUCT_DIR)/content_shell/java/libs/chromium_content.jar', + '<(PRODUCT_DIR)/lib.java/chromium_base.jar', + '<(PRODUCT_DIR)/lib.java/chromium_content.jar', + '<(PRODUCT_DIR)/lib.java/chromium_media.jar', + '<(PRODUCT_DIR)/lib.java/chromium_net.jar', '<(PRODUCT_DIR)/content_shell/assets/content_shell.pak', '<(PRODUCT_DIR)/content_shell/libs/<(android_app_abi)/libcontent_shell_content_view.so', ], |