diff options
| author | cjhopman@chromium.org <cjhopman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-16 07:31:49 +0000 |
|---|---|---|
| committer | cjhopman@chromium.org <cjhopman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-16 07:31:49 +0000 |
| commit | b74cf84ed6060d3b00dc267faf72c41934e76ab2 (patch) | |
| tree | b797b4b5b17a85caa0c5ab78124410d3a78975e0 /chrome/chrome_android.gypi | |
| parent | e04e7bf44295e2b018bc581f81a2a855ae064095 (diff) | |
| download | chromium_src-b74cf84ed6060d3b00dc267faf72c41934e76ab2.zip chromium_src-b74cf84ed6060d3b00dc267faf72c41934e76ab2.tar.gz chromium_src-b74cf84ed6060d3b00dc267faf72c41934e76ab2.tar.bz2 | |
Specify jar name for apks in java_apk.gypi
Previously, we had to keep this name in sync in multiple places, the
"fake" xxx_java target and in sdk-targets.xml. Instead, it should be set
only in java_apk.gypi and then passed along to each of the places that
we were specifying it before.
Also, delete unused 'output' block and unneeded xxx_java dependencies.
BUG=
Review URL: https://chromiumcodereview.appspot.com/11363131
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168148 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_android.gypi')
| -rw-r--r-- | chrome/chrome_android.gypi | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/chrome/chrome_android.gypi b/chrome/chrome_android.gypi index a08f23c..9748bda 100644 --- a/chrome/chrome_android.gypi +++ b/chrome/chrome_android.gypi @@ -76,23 +76,18 @@ { # chromium_testshell creates a .jar as a side effect. Any java targets # that need that .jar in their classpath should depend on this target, - # chromium_testshell_java. + # chromium_testshell_java. Dependents of chromium_testshell receive its + # jar path in the variable 'apk_output_jar_path'. 'target_name': 'chromium_testshell_java', 'type': 'none', 'dependencies': [ - '../media/media.gyp:media_java', - 'chrome.gyp:chrome_java', 'chromium_testshell', ], - 'variables': { - 'output_jar': '<(PRODUCT_DIR)/lib.java/chromium_apk_chromium_testshell.jar' - }, - 'outputs': ['<(output_jar)'], # This all_dependent_settings is used for java targets only. This will add # the chromium_testshell jar to the classpath of dependent java targets. 'all_dependent_settings': { 'variables': { - 'input_jars_paths': ['<(output_jar)'], + 'input_jars_paths': ['>(apk_output_jar_path)'], }, }, # Add an action with the appropriate output. This allows the generated @@ -101,7 +96,7 @@ { 'action_name': 'fake_generate_jar', 'inputs': [], - 'outputs': ['<(output_jar)'], + 'outputs': ['>(apk_output_jar_path)'], 'action': [], }, ], |