From 2ac68c6892e5a59b5d346edeae17695b3ee384b4 Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Mon, 24 Mar 2014 18:26:36 +0000 Subject: [PATCH] Add tools to generated Android.mk Include the skia tools (bench, gm, tests) in the generated Android make file for the framework. They are commented out, so that a tester can include them if desired. BUG=skia:1975 R=halcanary@google.com, djsollen@google.com Author: scroggo@google.com Review URL: https://codereview.chromium.org/210173002 git-svn-id: http://skia.googlecode.com/svn/trunk@13915 2bbb7eff-a529-9590-31e7-b0007b416f81 --- platform_tools/android/gyp_gen/makefile_writer.py | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/platform_tools/android/gyp_gen/makefile_writer.py b/platform_tools/android/gyp_gen/makefile_writer.py index 6057cce..791d225 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) -- 2.7.4