diff options
| author | cjhopman@chromium.org <cjhopman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-11 02:03:08 +0000 |
|---|---|---|
| committer | cjhopman@chromium.org <cjhopman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-11 02:03:08 +0000 |
| commit | de020e009b781f183f1d2040cb7fe09f3bbfbc33 (patch) | |
| tree | f1ec3b877f1b5155b8113f2213976528dad83ab3 /content/content_shell.gypi | |
| parent | 67a111c32304f07cfce9de2f35768064b1c9829d (diff) | |
| download | chromium_src-de020e009b781f183f1d2040cb7fe09f3bbfbc33.zip chromium_src-de020e009b781f183f1d2040cb7fe09f3bbfbc33.tar.gz chromium_src-de020e009b781f183f1d2040cb7fe09f3bbfbc33.tar.bz2 | |
Use input_jars_paths for content_shell_apk and content_shell_test_apk
This makes these targets more consistent with how we build other java
targets. Also, reduces the need to specify the dependencies in
multiple places/files.
Fixes dependencies and inputs of these targets so that they are correct.
Previously the multiple places that jars they were specified were not
consistent with each other. Also, some imported ant build files were not
specified as inputs.
BUG=145988
Review URL: https://chromiumcodereview.appspot.com/10907076
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@155909 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/content_shell.gypi')
| -rw-r--r-- | content/content_shell.gypi | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/content/content_shell.gypi b/content/content_shell.gypi index b8200a5..f48b068 100644 --- a/content/content_shell.gypi +++ b/content/content_shell.gypi @@ -596,6 +596,12 @@ { 'target_name': 'content_shell_apk', 'type': 'none', + 'dependencies': [ + 'content_java', + '../base/base.gyp:base_java', + '../media/media.gyp:media_java', + '../net/net.gyp:net_java', + ], 'actions': [ { 'action_name': 'copy_and_strip_so', @@ -614,12 +620,11 @@ 'inputs': [ 'shell/android/java/content_shell_apk.xml', 'shell/android/java/AndroidManifest.xml', + '../build/android/ant/common.xml', + '../build/android/ant/sdk-targets.xml', '<!@(find shell/android/java -name "*.java")', '<!@(find shell/android/res -name "*")', - '<(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', + '>@(input_jars_paths)', '<(PRODUCT_DIR)/content_shell/assets/content_shell.pak', '<(PRODUCT_DIR)/content_shell/libs/<(android_app_abi)/libcontent_shell_content_view.so', ], @@ -643,12 +648,10 @@ '-DANDROID_SDK_VERSION=<(android_sdk_version)', '-DANDROID_GDBSERVER=<(android_gdbserver)', '-DCONFIGURATION_NAME=<(CONFIGURATION_NAME)', + '-DINPUT_JARS_PATHS=>(input_jars_paths)', '-buildfile', 'shell/android/java/content_shell_apk.xml', ], - 'dependencies': [ - 'content_java', - ], } ], }, |