Add tools to generated Android.mk

platform_tools/android/gyp_gen/makefile_writer.py

Index: platform_tools/android/gyp_gen/makefile_writer.py
diff --git a/platform_tools/android/gyp_gen/makefile_writer.py b/platform_tools/android/gyp_gen/makefile_writer.py
index 6057ccee303e7b5c10d54f60cc4edb134f675a7f..791d225f8b89328c5d6a298f069c8149317fe25e 100644
--- a/platform_tools/android/gyp_gen/makefile_writer.py
+++ b/platform_tools/android/gyp_gen/makefile_writer.py
@@ -71,7 +71,6 @@ AUTOGEN_WARNING = (
 """
 )
 
-
 DEBUGGING_HELP = (
 """
 ###############################################################################
@@ -101,6 +100,27 @@ DEBUGGING_HELP = (
 """
 )
 
+SKIA_TOOLS = (
+"""
+#############################################################
+# Build the skia tools
+#
+
+# benchmark (timings)
+#include $(BASE_PATH)/bench/Android.mk
+
+# golden-master (fidelity / regression test)
+#include $(BASE_PATH)/gm/Android.mk
+
+# unit-tests
+#include $(BASE_PATH)/tests/Android.mk
+
+# pathOps unit-tests
+# TODO include those sources!
+"""
+)
+
+
 class VarsDictData(object):
   """
   Helper class for keeping a VarsDict along with a name and an optional
@@ -179,4 +199,5 @@ def write_android_mk(target_dir, common, deviations_from_common):
     f.write('include external/stlport/libstlport.mk\n')
     f.write('LOCAL_MODULE:= libskia\n')
     f.write('include $(BUILD_SHARED_LIBRARY)\n')
+    f.write(SKIA_TOOLS)