Revert 156308 - Revert 156233 - Make apks be built in a consistent way

Revert 156308 - Revert 156233 - Make apks be built in a consistent way

This broke non-incremental Android builds.

In the original CL there was a discrepancy in the way that Gyp handled
paths and the way that Ant handled paths. Changed it so that
resource_dir is specified relative to java_in_dir so that Gyp and Ant
treat it the same. For http://crbug.com/145991 I will have to make
resource_dir be in a consistent location for all apk targets and at that
point it can be removed from the gyp files.

Original:https://chromiumcodereview.appspot.com/10914130

BUG=


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

[cjhopman, 2012-09-12 16:36:15]

tedchoc: content/shell/android
brettw: content/

[Ted C, 2012-09-12 23:35:25]

lgtm

http://codereview.chromium.org/10913225/diff/3006/build/java_apk.gypi
File build/java_apk.gypi (right):

http://codereview.chromium.org/10913225/diff/3006/build/java_apk.gypi#newcode16
build/java_apk.gypi:16: #     'resource_dir': 'res',
maybe have a comment that this is relative to java_in_dir?  or do you think
looking down at the usage is sufficient

[cjhopman, 2012-09-18 20:33:41]

brettw could you take a look/rubberstamp the gyp changes in content/?

[brettw, 2012-09-18 21:09:05]

lgtm rubberstamp

[commit-bot: I haz the power, 2012-09-18 21:32:03]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/cjhopman@chromium.org/10913225/11001

[commit-bot: I haz the power, 2012-09-19 00:56:51]

Retried try job too often for step(s) unit_tests

[commit-bot: I haz the power, 2012-09-19 00:59:00]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/cjhopman@chromium.org/10913225/11001

[commit-bot: I haz the power, 2012-09-19 04:16:29]

Change committed as 157502