Revert of Expose resources in Robolectric/JUnit tests.

build/android/gyp/write_build_config.py

 #!/usr/bin/env python
 #
 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Writes a build_config file.
 
 The build_config file for a target is a json file containing information about
 how to build that target based on the target's dependencies. This includes
@@ skipping 326 matching lines @@
       'java_binary': ['build_config', 'jar_path'],
       'java_library': ['build_config', 'jar_path'],
       'java_prebuilt': ['build_config', 'jar_path'],
       'android_assets': ['build_config'],
       'android_resources': ['build_config', 'resources_zip'],
       'android_apk': ['build_config', 'jar_path', 'dex_path', 'resources_zip'],
       'deps_dex': ['build_config', 'dex_path'],
       'dist_jar': ['build_config'],
       'resource_rewriter': ['build_config'],
       'group': ['build_config'],
-      'junit_binary': ['build_config'],
   }
   required_options = required_options_map.get(options.type)
   if not required_options:
     raise Exception('Unknown type: <%s>' % options.type)
 
   build_utils.CheckOptions(options, parser, required_options)
 
   # Java prebuilts are the same as libraries except for in gradle files.
   is_java_prebuilt = options.type == 'java_prebuilt'
   if is_java_prebuilt:
@@ skipping 176 matching lines @@
       else:
         owned_resource_zips.add(c['resources_zip'])
 
     for c in all_library_deps:
       if c['supports_android']:
         owned_resource_dirs.difference_update(c['owned_resources_dirs'])
         owned_resource_zips.difference_update(c['owned_resources_zips'])
     deps_info['owned_resources_dirs'] = list(owned_resource_dirs)
     deps_info['owned_resources_zips'] = list(owned_resource_zips)
 
-  if options.type in (
-      'android_resources', 'android_apk', 'junit_binary', 'resource_rewriter'):
+  if options.type in ('android_resources','android_apk', 'resource_rewriter'):
     config['resources'] = {}
     config['resources']['dependency_zips'] = [
         c['resources_zip'] for c in all_resources_deps]
     config['resources']['extra_package_names'] = []
     config['resources']['extra_r_text_files'] = []
 
   if options.type == 'android_apk' or options.type == 'resource_rewriter':
     config['resources']['extra_package_names'] = [
         c['package_name'] for c in all_resources_deps if 'package_name' in c]
     config['resources']['extra_r_text_files'] = [
@@ skipping 155 matching lines @@
     deps_info['java_resources_jar'] = options.java_resources_jar_path
 
   build_utils.WriteJson(config, options.build_config, only_if_changed=True)
 
   if options.depfile:
     build_utils.WriteDepfile(options.depfile, options.build_config, all_inputs)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))