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

platform_tools/android/gyp_gen/tool_makefile_writer.py

Index: platform_tools/android/gyp_gen/tool_makefile_writer.py
diff --git a/platform_tools/android/gyp_gen/tool_makefile_writer.py b/platform_tools/android/gyp_gen/tool_makefile_writer.py
index 897a2b86078e02b0e55dfdb4ae7829a36f0051c3..66d76cc0abecfea4445d17f0a582146c42508750 100644
--- a/platform_tools/android/gyp_gen/tool_makefile_writer.py
+++ b/platform_tools/android/gyp_gen/tool_makefile_writer.py
@@ -14,6 +14,19 @@ import makefile_writer
 import os
 import vars_dict_lib
 
+SKIA_RESOURCES = (

[scroggo, 2015/02/23 18:52:16]

I thought you had decided to create a separate target for this?

[djsollen, 2015/02/23 19:04:46]

It was a good idea, but the execution didn't work out.

+"""
+
+# Setup directory to store skia's resources in the directory structure that
+# the Android testing infrastructure expects
+skia_resources_dir := $(call intermediates-dir-for,PACKAGING,skia_resources)/DATA
+$(shell mkdir -p $(skia_resources_dir))
+$(shell cp -r $(LOCAL_PATH)/../resources/. $(skia_resources_dir)/skia_resources)
+LOCAL_PICKUP_FILES := $(skia_resources_dir)
+skia_resources_dir :=

[scroggo, 2015/02/23 18:52:16]

What does this line do? Prevent skia_resources_dir from being used later?

[djsollen, 2015/02/23 19:04:46]

Yes, it basically nulls out the value since it won't be cleared by the standard
CLEAR_VARS command

+
+"""
+)
 
 def write_tool_android_mk(target_dir, var_dict):
   """Write Android.mk for a Skia tool.
@@ -31,9 +44,7 @@ def write_tool_android_mk(target_dir, var_dict):
 
     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)

[scroggo, 2015/02/23 18:52:16]

We have some tests that make sure the makefile writer didn't change
unexpectedly. In order to update them, you'll need to run something like:

python platform_tools/android/tests/makefile_writer_tests.py --rebaseline

[djsollen, 2015/02/23 19:04:46]

Acknowledged.

     f.write('include $(BUILD_NATIVE_TEST)\n')