Fix non-goma android build after r238630

Fix non-goma android build after r238630

dirname outputs "." when given an empty argument, which gyp rules then
interpret as goma being available.

Remove ANDROID_GOMA_WRAPPER which is no longer used, and use GOMA_DIR
directly for android build.

BUG=
NOTRY=true

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=238718

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=238727

[boliu, 2013-12-04 17:15:18]

I don't actually use goma, so don't know how folks usually enable it, but it
looks like the $GOMA_DIR->$ANDROID_GOMA_WRAPPER->android_goma_dir translation is
redundant.

[Nico, 2013-12-04 17:23:27]

lgtm

I think the android buildbots had issues due to a previous iteration of this
ignoring GOMA_DIR, and this CL isn't breaking that.

third_party/webrtc/build/generate_asm_header.gypi references
ANDROID_GOMA_WRAPPER – I suppose that's only used upstream by webrtc, not
downstream in chromium land? And I guess just replacing ANDROID_GOMA_WRAPPER
with GOMA_DIR should work there too?

[boliu, 2013-12-04 17:45:45]

Ok, android trybots passed compile (in reasonable amount of time). Fingers
crossed!

[commit-bot: I haz the power, 2013-12-04 17:46:54]

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

[commit-bot: I haz the power, 2013-12-04 17:48:11]

Change committed as 238718

[boliu, 2013-12-04 17:55:02]

Well, that was fast, broke gyp on chromeos...

[boliu, 2013-12-04 18:06:11]

android_goma_dir needs to be defined even on non-android builds, so removing the
else block broke every other platform

[commit-bot: I haz the power, 2013-12-04 18:35:32]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/boliu@chromium.org/104563004/40001

[commit-bot: I haz the power, 2013-12-04 18:35:40]

Change committed as 238727

[Yoshisato Yanagisawa, 2013-12-05 01:49:02]

Thank you for fixing.