diff options
| author |  Derek Sollenberger <djsollen@google.com> | 2016-12-09 09:35:50 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-12-09 15:31:40 +0000 |
| commit | 923c0821337f17adb71a928c016618822d2083af (patch) | |
| tree | 057a6657be522f96b44eb0a1ffac2faf6d900194 /platform_tools | |
| parent | a2ca8ed771ed9b1fdaf6b8e0e2395397126c171a (diff) | |
Don't compile the Skia tools for PDK builds.
Change-Id: I9d64a065bf05d76e131b2d0ab73d136ebbae263f
Reviewed-on: https://skia-review.googlesource.com/5746
Reviewed-by: Leon Scroggins <scroggo@google.com>
Commit-Queue: Derek Sollenberger <djsollen@google.com>
Diffstat (limited to 'platform_tools')
| -rw-r--r-- | platform_tools/android/gyp_gen/makefile_writer.py | 5 | ||||
| -rw-r--r-- | platform_tools/android/tests/expectations/Android.mk | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/platform_tools/android/gyp_gen/makefile_writer.py b/platform_tools/android/gyp_gen/makefile_writer.py index 6641f7f973..e60ce5b044 100644 --- a/platform_tools/android/gyp_gen/makefile_writer.py +++ b/platform_tools/android/gyp_gen/makefile_writer.py @@ -114,14 +114,17 @@ DEBUGGING_HELP = ( SKIA_TOOLS = ( """ ############################################################# -# Build the skia tools +# Build the skia tools (except in the PDK build) # +ifneq ($(TARGET_BUILD_PDK),true) # benchmark (timings) include $(BASE_PATH)/bench/Android.mk # diamond-master (one test to rule them all) include $(BASE_PATH)/dm/Android.mk + +endif # disable for PDK """ ) diff --git a/platform_tools/android/tests/expectations/Android.mk b/platform_tools/android/tests/expectations/Android.mk index 861784a22c..4586a6adc8 100644 --- a/platform_tools/android/tests/expectations/Android.mk +++ b/platform_tools/android/tests/expectations/Android.mk @@ -165,11 +165,14 @@ include $(BASE_PATH)/skia_static_deps.mk include $(BUILD_SHARED_LIBRARY) ############################################################# -# Build the skia tools +# Build the skia tools (except in the PDK build) # +ifneq ($(TARGET_BUILD_PDK),true) # benchmark (timings) include $(BASE_PATH)/bench/Android.mk # diamond-master (one test to rule them all) include $(BASE_PATH)/dm/Android.mk + +endif # disable for PDK |