Update how we package skia resource for android testing

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 ac00be8e1c4b648eab58225e037b828643017766..2fef11009d56b9cc05508170231695e1f5159d85 100644
--- a/platform_tools/android/gyp_gen/tool_makefile_writer.py
+++ b/platform_tools/android/gyp_gen/tool_makefile_writer.py
@@ -16,14 +16,11 @@ 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 :=
-
+# Store skia's resources in the directory structure that the Android testing
+# infrastructure expects.  This requires that Skia maintain a symlinked
+# subdirectory in the DATA folder that points to the top level skia resources...
+#  i.e. external/skia/DATA/skia_resources --> ../resources
+LOCAL_PICKUP_FILES := $(LOCAL_PATH)/../DATA
 """
 )