[Android] Skip generating v14 resources if already a version is specified.

[Android] Skip generating v14 resources if already a version is specified.

If a version is already specified for resources, (e.g., layout-v20/), it shouldn't
be generating v14 compatible resource from it, because it's an explicit intention
to apply only to that version. The exception is for style resources due to the reason
explained at here https://codereview.chromium.org/16125003/.

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

[newt (away), 2013-06-07 04:24:09]

lgtm with a few nits.

this is a good change, thanks!

https://codereview.chromium.org/15907024/diff/1/build/android/gyp/generate_v1...
File build/android/gyp/generate_v14_compatible_resources.py (right):

https://codereview.chromium.org/15907024/diff/1/build/android/gyp/generate_v1...
build/android/gyp/generate_v14_compatible_resources.py:245:
api_version_qualifier_index = -1
super minor nit: "api_level"

https://codereview.chromium.org/15907024/diff/1/build/android/gyp/generate_v1...
build/android/gyp/generate_v14_compatible_resources.py:248: if
re.match('\Av[0-9]+$', qualifier):
"^" instead of "\A" for familiarity and consistency. ("\A" is only needed for
multiline matches). Or you could remove it altogether since re.match() only
matches at the beginning of the string -- so, "^" is actually redundant.

https://codereview.chromium.org/15907024/diff/1/build/android/gyp/generate_v1...
build/android/gyp/generate_v14_compatible_resources.py:266: # TODO(kkimlabs):
don't process xml directly once all layouts have
you can probably remove this TODO, since we decided that we should always
process the xml directory, even after the layouts are all moved.

[Kibeom Kim (inactive), 2013-06-07 05:07:19]

https://codereview.chromium.org/15907024/diff/1/build/android/gyp/generate_v1...
File build/android/gyp/generate_v14_compatible_resources.py (right):

https://codereview.chromium.org/15907024/diff/1/build/android/gyp/generate_v1...
build/android/gyp/generate_v14_compatible_resources.py:245:
api_version_qualifier_index = -1
On 2013/06/07 04:24:09, newt wrote:
> super minor nit: "api_level"

Done.

https://codereview.chromium.org/15907024/diff/1/build/android/gyp/generate_v1...
build/android/gyp/generate_v14_compatible_resources.py:248: if
re.match('\Av[0-9]+$', qualifier):
On 2013/06/07 04:24:09, newt wrote:
> "^" instead of "\A" for familiarity and consistency. ("\A" is only needed for
> multiline matches). Or you could remove it altogether since re.match() only
> matches at the beginning of the string -- so, "^" is actually redundant.

Done.

https://codereview.chromium.org/15907024/diff/1/build/android/gyp/generate_v1...
build/android/gyp/generate_v14_compatible_resources.py:266: # TODO(kkimlabs):
don't process xml directly once all layouts have
On 2013/06/07 04:24:09, newt wrote:
> you can probably remove this TODO, since we decided that we should always
> process the xml directory, even after the layouts are all moved.

Done.

[newt (away), 2013-06-07 13:59:09]

lgtm

[commit-bot: I haz the power, 2013-06-07 16:53:33]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/kkimlabs@chromium.org/15907024/5001

[commit-bot: I haz the power, 2013-06-07 20:28:52]

Change committed as 204910