diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-05-16 18:11:51 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-05-16 18:11:51 +0000 |
| commit | 120c99993e60e7aedb0838f09d6f1b1d2f576c78 (patch) | |
| tree | 9b9df3631f8f0e76fb9ece63d4462ff3fc76c797 /platform_tools/android/gyp_gen | |
| parent | 25c1066e4d23cf7cb1795c78987f4fde08282b46 (diff) | |
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
Diffstat (limited to 'platform_tools/android/gyp_gen')
| -rw-r--r-- | platform_tools/android/gyp_gen/makefile_writer.py | 3 |
1 files changed, 3 insertions, 0 deletions
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 """ ) |