Rename output jar created by apks to have chromium_apk_ prefix.

Rename output jar created by apks to have chromium_apk_ prefix.

Output jar created by apks, currently have chromium_ prefix, this
prefix is also used by jar targets, to avoid name space collision
change the prefix from chromium to chromium_apk.

BUG=


Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=161238

[shashi, 2012-10-08 23:42:18]

Small cleanup needed to disambiguate namespace for building Chrome on Android
with the chromium-apk.xml

[cjhopman, 2012-10-09 18:13:00]

lgtm

[shashi, 2012-10-09 22:03:27]

jam: content/
sky: chrome/

[sky, 2012-10-10 03:29:02]

LGTM

[shashi, 2012-10-10 18:54:40]

jam: gentle reminder, this is a really short one :).

[jam, 2012-10-10 20:13:32]

On 2012/10/10 18:54:40, shashi wrote:
> jam: gentle reminder, this is a really short one :).

lgtm (i was ooo, did you not get an autoreply? also feel free to send to other
owners...)

[commit-bot: I haz the power, 2012-10-10 20:20:02]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/shashishekhar@chromium.org/11094015/1

[commit-bot: I haz the power, 2012-10-10 20:20:07]

Failed to apply patch for chrome/chrome_android.gypi:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file chrome/chrome_android.gypi
  Hunk #1 FAILED at 94.
  Hunk #2 succeeded at 111 (offset -1 lines).
  1 out of 2 hunks FAILED -- saving rejects to file
chrome/chrome_android.gypi.rej

Patch:       chrome/chrome_android.gypi
Index: chrome/chrome_android.gypi
diff --git a/chrome/chrome_android.gypi b/chrome/chrome_android.gypi
index
85d27f9d44c457699f508758ef9f616029cb658b..3bea3b4e44f5490bdbda9a442ef1bc930efaca74
100644
--- a/chrome/chrome_android.gypi
+++ b/chrome/chrome_android.gypi
@@ -94,16 +94,17 @@
         'chrome.gyp:chrome_java',
         'chromium_testshell',
       ],
+      'variables': {
+        'output_jar':
'<(PRODUCT_DIR)/lib.java/chromium_apk_chromium_testshell.jar'
+      },
       'export_dependent_settings': [
         '../media/media.gyp:media_java',
         'chrome.gyp:chrome_java',
       ],
-      'outputs': [
-        '<(PRODUCT_DIR)/lib.java/chromium_chromium_testshell.jar',
-      ],
+      'outputs': ['<(output_jar)'],
       'direct_dependent_settings': {
         'variables': {
-          'input_jars_paths':
['<(PRODUCT_DIR)/lib.java/chromium_chromium_testshell.jar'],
+          'input_jars_paths': ['<(output_jar)'],
         },
       },
       # Add an action with the appropriate output. This allows the generated
@@ -112,7 +113,7 @@
         {
           'action_name': 'fake_generate_jar',
           'inputs': [],
-          'outputs':
['<(PRODUCT_DIR)/lib.java/chromium_chromium_testshell.jar'],
+          'outputs': ['<(output_jar)'],
           'action': [],
         },
       ],

[shashi, 2012-10-10 20:22:08]

Thanks, no I did not get ooo message, maybe something wrong with my email setup.
On 2012/10/10 20:13:32, John Abd-El-Malek wrote:
> On 2012/10/10 18:54:40, shashi wrote:
> > jam: gentle reminder, this is a really short one :).
> 
> lgtm (i was ooo, did you not get an autoreply? also feel free to send to other
> owners...)

[commit-bot: I haz the power, 2012-10-10 22:02:10]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/shashishekhar@chromium.org/11094015/5

[commit-bot: I haz the power, 2012-10-11 00:07:22]

Change committed as 161238