AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Don't compile the Skia tools for PDK builds.

Browse Source 
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>
This commit is contained in:
Derek Sollenberger 2016-12-09 09:35:50 -05:00 committed by Skia Commit-Bot
parent a2ca8ed771
commit 923c082133
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
platform_tools/android/gyp_gen/makefile_writer.py
View File

@ -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
"""
)

5
platform_tools/android/tests/expectations/Android.mk
View File

@ -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