Revert "Revert 155950 - Add initial Chromium TestShell support for Android"

Revert "Revert 155950 - Add initial Chromium TestShell support for Android"

Fixed build breakages:
-Had to add DEPS file for testshell/java.
-Something changed with ant from the time I tested and the time my CL got committed.  Had to move
sdk-targets.xml import in the ant file to the end of the file.

This reverts commit 2d30dc03dc0bd0723236c549313774119f163056.

BUG=


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

[David Trainor- moved to gerrit, 2012-09-11 07:56:48]

Reverting the revert from here: https://chromiumcodereview.appspot.com/10911202/
(thanks for the quick revert and links to the error messages Nico!).

Yaron/Shashi, could you look at the two places I commented?

Scott: Do you mind giving a follow up LGTM (assuming you're okay with this based
on the LGTM you gave on the reverted CL).

There were two issues.  One is that I had to add a DEPS file to
chrome/android/testshell/java.  The other is that something with our ant build
process changed after I queued my commit.  Caused a failure.  Downstream also
hit an issue where we couldn't build all_android.gyp:All because
chromium_testshell requires sdk builds.  Made that target conditional on that
requirement.

https://chromiumcodereview.appspot.com/10905209/diff/2001/build/all_android.gyp
File build/all_android.gyp (right):

https://chromiumcodereview.appspot.com/10905209/diff/2001/build/all_android.g...
build/all_android.gyp:28: '../chrome/chrome.gyp:chromium_testshell',
Made this a conditional target now, since the testshell requires sdk builds.

https://chromiumcodereview.appspot.com/10905209/diff/2001/chrome/android/test...
File chrome/android/testshell/java/chromium_testshell_apk.xml (left):

https://chromiumcodereview.appspot.com/10905209/diff/2001/chrome/android/test...
chrome/android/testshell/java/chromium_testshell_apk.xml:72: <import
file="../../../../build/android/ant/sdk-targets.xml"/>
Had to move this down here.  Looks like something from ant changed and the build
was failing otherwise.  Shashi any ideas?  Is this okay?

[Yaron, 2012-09-11 15:41:42]

lgtm

http://codereview.chromium.org/10905209/diff/2001/chrome/android/testshell/ja...
File chrome/android/testshell/java/chromium_testshell_apk.xml (left):

http://codereview.chromium.org/10905209/diff/2001/chrome/android/testshell/ja...
chrome/android/testshell/java/chromium_testshell_apk.xml:72: <import
file="../../../../build/android/ant/sdk-targets.xml"/>
On 2012/09/11 07:56:48, dtrainor wrote:
> Had to move this down here.  Looks like something from ant changed and the
build
> was failing otherwise.  Shashi any ideas?  Is this okay?

Ya I think Chris made a change which requires it

[sky, 2012-09-11 16:13:20]

LGTM

[commit-bot: I haz the power, 2012-09-12 18:02:45]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/dtrainor@chromium.org/10905209/2001

[commit-bot: I haz the power, 2012-09-12 18:50:54]

Try job failure for 10905209-2001 (retry) on android for steps "compile, build"
(clobber build).
It's a second try, previously, steps "compile, build" failed.
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=android&nu...

[commit-bot: I haz the power, 2012-09-12 20:32:29]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/dtrainor@chromium.org/10905209/2001

[commit-bot: I haz the power, 2012-09-12 21:24:08]

Try job failure for 10905209-2001 (retry) on android for steps "compile, build"
(clobber build).
It's a second try, previously, steps "compile, build" failed.
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=android&nu...

[Yaron, 2012-09-12 21:28:38]

On 2012/09/12 21:24:08, I haz the power (commit-bot) wrote:
> Try job failure for 10905209-2001 (retry) on android for steps "compile,
build"
> (clobber build).
> It's a second try, previously, steps "compile, build" failed.
>
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=android&nu...

Android failure is due to a clean build break that's affecting android trybots. 
It's been fixed but will take some time to propagate. Probably wait 20-30 mins
and try again

[commit-bot: I haz the power, 2012-09-12 23:49:36]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/dtrainor@chromium.org/10905209/9003

[commit-bot: I haz the power, 2012-09-13 01:44:21]

Change committed as 156458