Allow overriding Chromium-branded Android resources.

Allow overriding Chromium-branded Android resources.

The chrome_java target includes several resources that are specific to a
Chromium-branded build (e.g. the Chromium icon and app name). It's now
possible to set a value for the GYP/GN variable
android_branding_res_dirs to override the directory in which these
branding resources live. This enables easy swapping of the resources
when building, e.g., a Google Chrome-branded build.

R=yfriedman@chromium.org
TBR=thestig@chromium.org
BUG=520794, 474747
Committed: https://chromium.googlesource.com/chromium/src/+/60e61e8a7f98c447baadb317ad56d49c755e0071

[newt (away), 2015-08-17 16:22:23]

newt@chromium.org changed reviewers:
+ yfriedman@chromium.org

[newt (away), 2015-08-17 16:22:23]

PTAL

[Yaron, 2015-08-17 17:05:03]

lgtm

[newt (away), 2015-08-17 17:27:16]

newt@chromium.org changed reviewers:
+ thestig@chromium.org

[newt (away), 2015-08-17 17:27:16]

TBR thestig for Android-only change to chrome.gyp

[newt (away), 2015-08-17 17:27:21]

The CQ bit was checked by newt@chromium.org

[commit-bot: I haz the power, 2015-08-17 17:27:41]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1301613002/1
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1301613002/1

[agrieve, 2015-08-17 17:27:47]

On 2015/08/17 17:05:03, Yaron (OOO 8.18-8.21) wrote:
> lgtm

(added BUG=474747, as I think this fixes that as well!)

[newt (away), 2015-08-17 17:29:05]

The CQ bit was unchecked by newt@chromium.org

[newt (away), 2015-08-17 17:29:10]

The CQ bit was checked by newt@chromium.org

[newt (away), 2015-08-17 17:29:43]

On 2015/08/17 17:27:47, agrieve wrote:
> On 2015/08/17 17:05:03, Yaron (OOO 8.18-8.21) wrote:
> > lgtm
> 
> (added BUG=474747, as I think this fixes that as well!)

Indeed. Thanks!

[commit-bot: I haz the power, 2015-08-17 17:29:47]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1301613002/1
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1301613002/1

[commit-bot: I haz the power, 2015-08-17 17:38:08]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-08-17 17:38:09]

Try jobs failed on following builders:
  chromium_presubmit on tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/chromium_presub...)

[newt (away), 2015-08-17 17:40:30]

The CQ bit was checked by newt@chromium.org

[commit-bot: I haz the power, 2015-08-17 17:40:58]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1301613002/1
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1301613002/1

[commit-bot: I haz the power, 2015-08-17 20:30:48]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-08-17 20:30:49]

Try jobs failed on following builders:
  linux_chromium_rel_ng on tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...)

[newt (away), 2015-08-17 20:43:51]

Committed patchset #1 (id:1) manually as
60e61e8a7f98c447baadb317ad56d49c755e0071 (presubmit successful).

[Lei Zhang, 2015-08-17 21:19:28]

lgtm