[Android][gn] Add android resources templates

[Android][gn] Add android resources templates

This adds support for android resources to gn.

Two new templates are introduced:

java_string_grd: This is like gyp's build/java_strings_grd.gypi. It runs
grit and generates Android strings.xml files and then zips them
together.
android_resources: This is the target for android resources. It is
mostly a wrapper around process_resources.py. This is *not part* of
android_library (like it is in gyp). Making these two things separate is
more like facebook's BUCK and google's internal build rules (and gyp's
java.gypi and java_apk.gypi have gotten way too big and complicated).

Changes to the actual build scripts are very minor except for the added
support for andoid_resources to write_build_config.py. Building
resources requires getting all the transitive resource dependencies, and
so this reuses the simple sorted transitive dependency thing from
write_ordered_libraries.py.

TBR=rch@chromium.org
BUG=359249
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=283293

[cjhopman, 2014-07-01 22:18:46]

newt: *

[newt (away), 2014-07-07 21:47:12]

https://codereview.chromium.org/361633002/diff/20001/build/android/gyp/find.py
File build/android/gyp/find.py (right):

https://codereview.chromium.org/361633002/diff/20001/build/android/gyp/find.p...
build/android/gyp/find.py:14: 
two newlines

https://codereview.chromium.org/361633002/diff/20001/build/android/gyp/proces...
File build/android/gyp/process_resources.py (right):

https://codereview.chromium.org/361633002/diff/20001/build/android/gyp/proces...
build/android/gyp/process_resources.py:92: raise Exception('One of --R-dir or
--srcjar-out must be specified.')
Down below, we assume that exactly one of these options was supplied. How about
checking for that condition here:

    if (options.R_dir is None) == (options.srcjar_out is None):
        ...

https://codereview.chromium.org/361633002/diff/20001/build/android/gyp/util/b...
File build/android/gyp/util/build_utils.py (right):

https://codereview.chromium.org/361633002/diff/20001/build/android/gyp/util/b...
build/android/gyp/util/build_utils.py:241: def
GetSortedTransitiveDependencies(top, deps_func):
What the heck is a deps_func? This function and its arguments are non-obvious
enough that they probably deserve a comment.

https://codereview.chromium.org/361633002/diff/20001/build/android/gyp/write_...
File build/android/gyp/write_build_config.py (right):

https://codereview.chromium.org/361633002/diff/20001/build/android/gyp/write_...
build/android/gyp/write_build_config.py:13: other target's that depend on that
one.
s/target's/targets

https://codereview.chromium.org/361633002/diff/20001/build/android/gyp/write_...
build/android/gyp/write_build_config.py:16: android_library: An android library
containing java code.
mention new types here

https://codereview.chromium.org/361633002/diff/20001/build/android/gyp/write_...
build/android/gyp/write_build_config.py:22:
--python-arg=@(build_config_path):javac:classpath
Is this syntax correct? Also, if usage of this is rare, could we instead use
some alphabetic syntax (easier to interpret and to grep) rather than symbols?
e.g. "@BuildConfigVar(build_config_path:javac:classpath)"

https://codereview.chromium.org/361633002/diff/20001/build/android/gyp/write_...
build/android/gyp/write_build_config.py:59: parser.add_option('--type',
help='Type of this target.')
"e.g. android_library"

https://codereview.chromium.org/361633002/diff/20001/build/android/gyp/write_...
build/android/gyp/write_build_config.py:103: all_resources_deps =
DepsOfType('android_resources', all_deps_configs)
all_resources_deps contains only android_resources configs, yet it's used below
when setting srcjars for an android_library config. Is this correct?

https://codereview.chromium.org/361633002/diff/20001/build/config/android/rul...
File build/config/android/rules.gni (right):

https://codereview.chromium.org/361633002/diff/20001/build/config/android/rul...
build/config/android/rules.gni:261: # This creates an resources zip file that
will be used when building an Android
s/an/a

https://codereview.chromium.org/361633002/diff/20001/build/config/android/rul...
build/config/android/rules.gni:305: android_manifest = invoker.android_manifest
+ ""
Is + "" here to force a conversion to string? Or a typo?

[cjhopman, 2014-07-08 00:16:27]

https://codereview.chromium.org/361633002/diff/20001/build/android/gyp/find.py
File build/android/gyp/find.py (right):

https://codereview.chromium.org/361633002/diff/20001/build/android/gyp/find.p...
build/android/gyp/find.py:14: 
On 2014/07/07 21:47:11, newt wrote:
> two newlines

Done.

https://codereview.chromium.org/361633002/diff/20001/build/android/gyp/proces...
File build/android/gyp/process_resources.py (right):

https://codereview.chromium.org/361633002/diff/20001/build/android/gyp/proces...
build/android/gyp/process_resources.py:92: raise Exception('One of --R-dir or
--srcjar-out must be specified.')
On 2014/07/07 21:47:11, newt wrote:
> Down below, we assume that exactly one of these options was supplied. How
about
> checking for that condition here:
> 
>     if (options.R_dir is None) == (options.srcjar_out is None):
>         ...

Done.

https://codereview.chromium.org/361633002/diff/20001/build/android/gyp/util/b...
File build/android/gyp/util/build_utils.py (right):

https://codereview.chromium.org/361633002/diff/20001/build/android/gyp/util/b...
build/android/gyp/util/build_utils.py:241: def
GetSortedTransitiveDependencies(top, deps_func):
On 2014/07/07 21:47:11, newt wrote:
> What the heck is a deps_func? This function and its arguments are non-obvious
> enough that they probably deserve a comment.

Done.

https://codereview.chromium.org/361633002/diff/20001/build/android/gyp/write_...
File build/android/gyp/write_build_config.py (right):

https://codereview.chromium.org/361633002/diff/20001/build/android/gyp/write_...
build/android/gyp/write_build_config.py:13: other target's that depend on that
one.
On 2014/07/07 21:47:12, newt wrote:
> s/target's/targets

Done.

https://codereview.chromium.org/361633002/diff/20001/build/android/gyp/write_...
build/android/gyp/write_build_config.py:16: android_library: An android library
containing java code.
On 2014/07/07 21:47:12, newt wrote:
> mention new types here

Done.

https://codereview.chromium.org/361633002/diff/20001/build/android/gyp/write_...
build/android/gyp/write_build_config.py:22:
--python-arg=@(build_config_path):javac:classpath
On 2014/07/07 21:47:12, newt wrote:
> Is this syntax correct? 
No, it wasn't. Now it is.

> Also, if usage of this is rare, could we instead use
> some alphabetic syntax (easier to interpret and to grep) rather than symbols?
> e.g. "@BuildConfigVar(build_config_path:javac:classpath)"

That's a really good idea. I'll do that in a quick followup.

https://codereview.chromium.org/361633002/diff/20001/build/android/gyp/write_...
build/android/gyp/write_build_config.py:59: parser.add_option('--type',
help='Type of this target.')
On 2014/07/07 21:47:11, newt wrote:
> "e.g. android_library"

Done.

https://codereview.chromium.org/361633002/diff/20001/build/android/gyp/write_...
build/android/gyp/write_build_config.py:103: all_resources_deps =
DepsOfType('android_resources', all_deps_configs)
On 2014/07/07 21:47:12, newt wrote:
> all_resources_deps contains only android_resources configs, yet it's used
below
> when setting srcjars for an android_library config. Is this correct?

It is. I added a comment below about it.

https://codereview.chromium.org/361633002/diff/20001/build/config/android/rul...
File build/config/android/rules.gni (right):

https://codereview.chromium.org/361633002/diff/20001/build/config/android/rul...
build/config/android/rules.gni:261: # This creates an resources zip file that
will be used when building an Android
On 2014/07/07 21:47:12, newt wrote:
> s/an/a

Done.

https://codereview.chromium.org/361633002/diff/20001/build/config/android/rul...
build/config/android/rules.gni:305: android_manifest = invoker.android_manifest
+ ""
On 2014/07/07 21:47:12, newt wrote:
> Is + "" here to force a conversion to string? Or a typo?

This line would fail if invoker.android_manifest is not a string.

It's a pattern I was playing with to get an early, useful error message. I don't
know if it was actually helpful or not, and haven't actually been using it.

[newt (away), 2014-07-09 00:25:50]

remember to add back ANDROID_JAVA_TAGGED_ONLY="false"

lgtm

https://codereview.chromium.org/361633002/diff/60001/build/android/gyp/util/b...
File build/android/gyp/util/build_utils.py (right):

https://codereview.chromium.org/361633002/diff/60001/build/android/gyp/util/b...
build/android/gyp/util/build_utils.py:250: A list of all transitve dependencies
of nodes in top, in order (a node will
"transitive"

[cjhopman, 2014-07-09 23:42:19]

brettw: for OWNERS of build/config (and others)

https://codereview.chromium.org/361633002/diff/60001/build/android/gyp/util/b...
File build/android/gyp/util/build_utils.py (right):

https://codereview.chromium.org/361633002/diff/60001/build/android/gyp/util/b...
build/android/gyp/util/build_utils.py:250: A list of all transitve dependencies
of nodes in top, in order (a node will
On 2014/07/09 00:25:49, newt wrote:
> "transitive"

Done.

[brettw, 2014-07-11 20:00:44]

lgtm

https://codereview.chromium.org/361633002/diff/80001/build/config/android/rul...
File build/config/android/rules.gni (right):

https://codereview.chromium.org/361633002/diff/80001/build/config/android/rul...
build/config/android/rules.gni:278: #    
build/android/gyp/generate_v14_compatible_resources.py). Defaults to false.
80 cols here & below.

https://codereview.chromium.org/361633002/diff/80001/build/secondary/tools/gr...
File build/secondary/tools/grit/grit_rule.gni (right):

https://codereview.chromium.org/361633002/diff/80001/build/secondary/tools/gr...
build/secondary/tools/grit/grit_rule.gni:165: resource_ids =
invoker.resource_ids
Can you add these new variables to the documentation at the top?

[cjhopman, 2014-07-11 23:24:54]

The CQ bit was checked by cjhopman@chromium.org

[commit-bot: I haz the power, 2014-07-11 23:26:29]

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

[commit-bot: I haz the power, 2014-07-12 00:07:31]

FYI, CQ is re-trying this CL (attempt #1).
The failing builders are:
  android_aosp on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/android_aosp/builds/9...)
  android_chromium_gn_compile_rel on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/android_chromium_gn_c...)
  android_clang_dbg on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/android_clang_dbg/bui...)
  android_dbg on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/android_dbg/builds/20...)
  chromium_presubmit on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/chromium_presubmit/bu...)
  ios_dbg_simulator on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/ios_dbg_simulator/bui...)
  ios_rel_device on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/ios_rel_device/builds...)
  ios_rel_device_ninja on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/ios_rel_device_ninja/...)
  linux_chromium_chromeos_clang_dbg on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/linux_chromium_chrome...)
  linux_chromium_chromeos_rel on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/linux_chromium_chrome...)
  linux_chromium_clang_dbg on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/linux_chromium_clang_...)
  linux_chromium_gn_rel on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/linux_chromium_gn_rel...)
  linux_chromium_rel on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/linux_chromium_rel/bu...)
  mac_chromium_compile_dbg on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/mac_chromium_compile_...)
  mac_chromium_rel on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/mac_chromium_rel/buil...)
  win8_chromium_rel on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/win8_chromium_rel/bui...)
  win_chromium_compile_dbg on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/win_chromium_compile_...)
  win_chromium_rel on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/win_chromium_rel/buil...)
  win_chromium_x64_rel on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/win_chromium_x64_rel/...)
  linux_gpu on tryserver.chromium.gpu
(http://build.chromium.org/p/tryserver.chromium.gpu/builders/linux_gpu/builds/...)
  mac_gpu on tryserver.chromium.gpu
(http://build.chromium.org/p/tryserver.chromium.gpu/builders/mac_gpu/builds/27809)

[commit-bot: I haz the power, 2014-07-12 00:11:19]

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

[commit-bot: I haz the power, 2014-07-12 00:11:20]

Try jobs failed on following builders:
  android_aosp on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/android_aosp/builds/9...)
  android_clang_dbg on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/android_clang_dbg/bui...)
  android_dbg on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/android_dbg/builds/20...)
  chromium_presubmit on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/chromium_presubmit/bu...)
  ios_dbg_simulator on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/ios_dbg_simulator/bui...)
  ios_rel_device on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/ios_rel_device/builds...)
  ios_rel_device_ninja on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/ios_rel_device_ninja/...)
  linux_chromium_chromeos_clang_dbg on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/linux_chromium_chrome...)
  linux_chromium_chromeos_rel on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/linux_chromium_chrome...)
  linux_chromium_rel on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/linux_chromium_rel/bu...)
  mac_chromium_compile_dbg on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/mac_chromium_compile_...)
  mac_chromium_rel on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/mac_chromium_rel/buil...)
  win8_chromium_rel on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/win8_chromium_rel/bui...)
  linux_gpu on tryserver.chromium.gpu
(http://build.chromium.org/p/tryserver.chromium.gpu/builders/linux_gpu/builds/...)
  mac_gpu on tryserver.chromium.gpu
(http://build.chromium.org/p/tryserver.chromium.gpu/builders/mac_gpu/builds/27821)

[cjhopman, 2014-07-14 20:07:55]

rch@: TBR for net/ OWNERS

[cjhopman, 2014-07-14 20:08:09]

The CQ bit was checked by cjhopman@chromium.org

[commit-bot: I haz the power, 2014-07-14 20:08:58]

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

[cjhopman, 2014-07-14 22:19:40]

The CQ bit was checked by cjhopman@chromium.org

[commit-bot: I haz the power, 2014-07-14 22:21:32]

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

[commit-bot: I haz the power, 2014-07-15 10:48:08]

FYI, CQ is re-trying this CL (attempt #1).
The failing builders are:
  android_dbg_triggered_tests on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/android_dbg_triggered...)
  mac_chromium_compile_dbg on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/mac_chromium_compile_...)
  mac_chromium_rel on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/mac_chromium_rel/buil...)
  win_chromium_rel on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/win_chromium_rel/buil...)

[commit-bot: I haz the power, 2014-07-15 16:50:06]

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

[commit-bot: I haz the power, 2014-07-15 16:50:07]

Try jobs failed on following builders:
  android_dbg_triggered_tests on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/android_dbg_triggered...)
  mac_chromium_compile_dbg on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/mac_chromium_compile_...)
  mac_chromium_rel on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/mac_chromium_rel/buil...)
  win_chromium_rel on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/win_chromium_rel/buil...)

[cjhopman, 2014-07-15 17:05:23]

The CQ bit was checked by cjhopman@chromium.org

[commit-bot: I haz the power, 2014-07-15 17:08:16]

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

[commit-bot: I haz the power, 2014-07-15 20:01:41]

FYI, CQ is re-trying this CL (attempt #1).
The failing builders are:
  android_dbg_triggered_tests on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/android_dbg_triggered...)
  win_chromium_rel on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/win_chromium_rel/buil...)

[commit-bot: I haz the power, 2014-07-16 00:11:12]

Change committed as 283293