From 120c99993e60e7aedb0838f09d6f1b1d2f576c78 Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Fri, 16 May 2014 18:11:51 +0000 Subject: Generate Android.mk for DM. ifdef out code that won't build where we don't have jsoncpp. Include ctype instead of string.h for tolower. Depends on https://codereview.chromium.org/282053002/ BUG=skia:2447 R=mtklein@google.com Author: scroggo@google.com Review URL: https://codereview.chromium.org/290603002 git-svn-id: http://skia.googlecode.com/svn/trunk@14768 2bbb7eff-a529-9590-31e7-b0007b416f81 --- platform_tools/android/gyp_gen/makefile_writer.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'platform_tools/android/gyp_gen') diff --git a/platform_tools/android/gyp_gen/makefile_writer.py b/platform_tools/android/gyp_gen/makefile_writer.py index 948407e974..3384773cb6 100644 --- a/platform_tools/android/gyp_gen/makefile_writer.py +++ b/platform_tools/android/gyp_gen/makefile_writer.py @@ -124,6 +124,9 @@ include $(BASE_PATH)/gm/Android.mk # unit-tests include $(BASE_PATH)/tests/Android.mk + +# diamond-master (one test to rule them all) +include $(BASE_PATH)/dm/Android.mk """ ) -- cgit v1.2.3