Add beginnings of android_apk and unittest_apk templates

build/android/gyp/write_build_config.py

Index: build/android/gyp/write_build_config.py
diff --git a/build/android/gyp/write_build_config.py b/build/android/gyp/write_build_config.py
index 01f9fb347bb3256767a7ccbc80bfafce71c53c3d..67e4a58aee9426590fc196553ebddb6d04316074 100755
--- a/build/android/gyp/write_build_config.py
+++ b/build/android/gyp/write_build_config.py
@@ -66,11 +66,11 @@ def main(argv):
       'dependencies may not write build_config files. Missing build_config '
       'files are handled differently based on the type of this target.')
 
-  # android_resources options
+  # android_resources/apk options
   parser.add_option('--srcjar', help='Path to target\'s resources srcjar.')
   parser.add_option('--resources-zip', help='Path to target\'s resources zip.')
 
-  # android_library options
+  # android_library/apk options
   parser.add_option('--jar-path', help='Path to target\'s jar output.')
 
   options, args = parser.parse_args(argv)
@@ -78,25 +78,34 @@ def main(argv):
   if args:
     parser.error('No positional arguments should be given.')
 
-  required_options = ('build_config', 'type')
-  build_utils.CheckOptions(options, parser, required_options)
 
   if not options.type in [
-      'android_library', 'android_resources']:
+      'android_library', 'android_resources', 'android_apk']:
     raise Exception('Unknown type: <%s>' % options.type)
 
-  if options.type == 'android_library':
-    required_options = ('jar_path',)
-    build_utils.CheckOptions(options, parser, required_options)
 
-  possible_deps_configs = build_utils.ParseGypList(
+  required_options = ['build_config'] + {
+      'android_library': ['jar_path'],
+      'android_resources': ['resources_zip'],
+      'android_apk': ['jar_path', 'resources_zip']
+    }[options.type]
+
+  build_utils.CheckOptions(options, parser, required_options)
+
+  possible_deps_config_paths = build_utils.ParseGypList(
       options.possible_deps_configs)
-  for c in possible_deps_configs:
-    if not os.path.exists(c):
-      # Currently we only allow deps to things that write build_config files.
-      raise Exception('Unknown dep type: ' + c)
 
-  direct_deps_config_paths = possible_deps_configs
+
+
+
+  allow_unknown_deps = options.type == 'android_apk'
+  unknown_deps = [

[newt (away), 2014/07/17 20:11:47]

s/unknown/missing or s/unknown/nonexistent ?

wait... are these deps that haven't been written yet? or deps that will never be
written?

[cjhopman, 2014/07/18 00:58:01]

So, possible_deps_configs would be the path to the .build_config for everything
listed in deps. However, only some types of targets actually write a
build_config file. So, right now, for libraries and resources I just call that
an error (because I don't know of any case where one of those types of targets
needs such a dep). For android_apk, deps could include things like
shared_library or something that generates an asset into asset_dir, so I allowed
that.

Ideally, your target just lists its deps in deps and things just work. Also, we
don't want making it work to require a lot of magic. This here is a bit of
magic, but I don't know if it will cause issues or not. Also, it's possible that
this write_build_config.py will be built into (or have more hooks into) gn such
that it could have access to the entire dependency graph and so understand
exactly what to do with the different deps (and be a bit less magical).

(did that make sense?)

Maybe unrecognized_deps would be better?

+      c for c in possible_deps_config_paths if not os.path.exists(c)]
+  if unknown_deps and not allow_unknown_deps:
+    raise Exception('Unknown deps: ' + unknown_deps)
+
+  direct_deps_config_paths = [
+      c for c in possible_deps_config_paths if not c in unknown_deps]
   all_deps_config_paths = GetAllDepsConfigsInOrder(direct_deps_config_paths)
 
   direct_deps_configs = [GetDepConfig(p) for p in direct_deps_config_paths]
@@ -115,8 +124,9 @@ def main(argv):
   }
   deps_info = config['deps_info']
 
-  if options.type == 'android_library':
+  if options.type in ['android_library', 'android_apk']:
     javac_classpath = [c['jar_path'] for c in direct_library_deps]
+    deps_info['resources_deps'] = [c['path'] for c in all_resources_deps]
     deps_info['jar_path'] = options.jar_path
     config['javac'] = {
       'classpath': javac_classpath,
@@ -128,10 +138,11 @@ def main(argv):
     config['javac']['srcjars'] = [
         c['srcjar'] for c in all_resources_deps if 'srcjar' in c]
 
-  if options.type == 'android_resources':
+  if options.type == 'android_resources' or options.type == 'android_apk':
     deps_info['resources_zip'] = options.resources_zip
     if options.srcjar:
       deps_info['srcjar'] = options.srcjar
+
     config['resources'] = {}
     config['resources']['dependency_zips'] = [
         c['resources_zip'] for c in all_resources_deps]