Ensure that skia's test resources are properly packaged on Android

platform_tools/android/gyp_gen/tool_makefile_writer.py

 #!/usr/bin/python
 
 # Copyright 2014 Google Inc.
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Code for generating Android.mk for a tool."""
 
 
 import android_framework_gyp
 import gypd_parser
 import makefile_writer
 import os
 import vars_dict_lib
 
+SKIA_RESOURCES = (
+"""
+# Setup directory to store skia's resources in the directory structure that
+# the Android testing infrastructure expects
+skia_res_dir := $(call intermediates-dir-for,PACKAGING,skia_resources)/DATA
+$(shell mkdir -p $(skia_res_dir))
+$(shell cp -r $(LOCAL_PATH)/../resources/. $(skia_res_dir)/skia_resources)
+LOCAL_PICKUP_FILES := $(skia_res_dir)
+skia_res_dir :=
+
+"""
+)
 
 def write_tool_android_mk(target_dir, var_dict):
   """Write Android.mk for a Skia tool.
 
   Args:
     target_dir: Destination for the makefile. Must not be None.
     var_dict: VarsDict containing variables for the makefile.
   """
   target_file = os.path.join(target_dir, 'Android.mk')
   with open(target_file, 'w') as f:
     f.write(makefile_writer.AUTOGEN_WARNING)
 
     makefile_writer.write_local_path(f)
     makefile_writer.write_clear_vars(f)
 
     makefile_writer.write_local_vars(f, var_dict, False, None)
 
-    makefile_writer.write_group(f, 'LOCAL_PICKUP_FILES',
-                                ['$(LOCAL_PATH)/../resources'], False)
-
+    f.write(SKIA_RESOURCES)
     f.write('include $(BUILD_NATIVE_TEST)\n')
 
 
 def generate_tool(gyp_dir, target_file, skia_trunk, dest_dir,
                   skia_lib_var_dict, local_module_name, local_module_tags,
                   desired_targets, gyp_source_dir=None):
   """Common steps for building one of the skia tools.
 
   Parse a gyp file and create an Android.mk for this tool.
 
@@ skipping 43 matching lines @@
     full_dest = os.path.join(skia_trunk, dest_dir)
   else:
     full_dest = dest_dir
 
   # If the path does not exist, create it. This will happen during testing,
   # where there is no subdirectory for each tool (just a temporary folder).
   if not os.path.exists(full_dest):
     os.mkdir(full_dest)
 
   write_tool_android_mk(target_dir=full_dest, var_dict=var_dict)