61744ec1d2
For now, remove json functionality and do not depend on json. This allows us to build and run until solving skbug.com/2448. bench/DeferredSurfaceCopyBench.cpp: Include GrRenderTarget last, so SK_SUPPORT_GPU will be set properly. bench/ResultsWriter.h: bench/benchmain.cpp: Remove JSONResultsWriter when SK_BUILD_JSON_WRITER is not defined, which is the case for the Android framework build. gyp/bench.gyp: Depend on skia and cutils (for android_atomic_inc etc). gyp/common_conditions.gypi: Define SK_BUILD_JSON_WRITER when skia_build_json_writer is set. gyp/common_variables.gypi: Add a flag for skia_build_json_writer, and set it only when skia_android_framework is not set. gyp/jsoncpp.gyp: Do not build jsoncpp when skia_build_json_writer is not defined. include/utils/SkJSONCPP.h: Do not include json headers when SK_BUILD_JSON_WRITER is not defined. platform_tools/android/bin/gyp_to_android.py: Generate bench/Android.mk. platform_tools/android/gyp_gen/gypd_parser.py: Skip dest_dir when checking for include_dirs. platform_tools/android/gyp_gen/makefile_writer.py: Build bench/Android.mk when building external/skia. platform_tools/android/gyp_gen/tool_makefile_writer.py: Add a parameter for putting the binary into /data/local/tmp. BUG=skia:2447 BUG=skia:2448 R=halcanary@google.com, reed@google.com Author: scroggo@google.com Review URL: https://codereview.chromium.org/282053002 git-svn-id: http://skia.googlecode.com/svn/trunk@14760 2bbb7eff-a529-9590-31e7-b0007b416f81
110 lines
2.7 KiB
Python
110 lines
2.7 KiB
Python
# GYP file to build performance testbench.
|
|
#
|
|
{
|
|
'includes': [
|
|
'apptype_console.gypi',
|
|
],
|
|
'targets': [
|
|
{
|
|
'target_name': 'bench',
|
|
'type': 'executable',
|
|
'dependencies': [
|
|
'skia_lib.gyp:skia_lib',
|
|
'bench_timer',
|
|
'flags.gyp:flags',
|
|
'jsoncpp.gyp:jsoncpp',
|
|
],
|
|
'sources': [
|
|
'../bench/SkBenchLogger.cpp',
|
|
'../bench/SkBenchLogger.h',
|
|
'../bench/SkGMBench.cpp',
|
|
'../bench/SkGMBench.h',
|
|
'../bench/benchmain.cpp',
|
|
'../tools/sk_tool_utils.cpp',
|
|
],
|
|
'conditions': [
|
|
['skia_gpu == 1',
|
|
{
|
|
'include_dirs' : [
|
|
'../src/gpu',
|
|
],
|
|
'dependencies': [
|
|
'gputest.gyp:skgputest',
|
|
],
|
|
},
|
|
],
|
|
['skia_android_framework == 1',
|
|
{
|
|
'libraries': [
|
|
'-lskia',
|
|
'-lcutils',
|
|
],
|
|
},
|
|
],
|
|
],
|
|
'includes': [
|
|
'bench.gypi',
|
|
'gmslides.gypi',
|
|
],
|
|
},
|
|
{
|
|
'target_name' : 'bench_timer',
|
|
'type': 'static_library',
|
|
'sources': [
|
|
'../bench/BenchTimer.h',
|
|
'../bench/BenchTimer.cpp',
|
|
'../bench/BenchSysTimer_mach.h',
|
|
'../bench/BenchSysTimer_mach.cpp',
|
|
'../bench/BenchSysTimer_posix.h',
|
|
'../bench/BenchSysTimer_posix.cpp',
|
|
'../bench/BenchSysTimer_windows.h',
|
|
'../bench/BenchSysTimer_windows.cpp',
|
|
],
|
|
'include_dirs': [
|
|
'../src/core',
|
|
'../src/gpu',
|
|
'../tools',
|
|
],
|
|
'direct_dependent_settings': {
|
|
'include_dirs': ['../bench'],
|
|
},
|
|
'dependencies': [
|
|
'skia_lib.gyp:skia_lib',
|
|
],
|
|
'conditions': [
|
|
[ 'skia_os not in ["mac", "ios"]', {
|
|
'sources!': [
|
|
'../bench/BenchSysTimer_mach.h',
|
|
'../bench/BenchSysTimer_mach.cpp',
|
|
],
|
|
}],
|
|
[ 'skia_os not in ["linux", "freebsd", "openbsd", "solaris", "android", "chromeos"]', {
|
|
'sources!': [
|
|
'../bench/BenchSysTimer_posix.h',
|
|
'../bench/BenchSysTimer_posix.cpp',
|
|
],
|
|
}],
|
|
[ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "chromeos"]', {
|
|
'link_settings': {
|
|
'libraries': [
|
|
'-lrt',
|
|
],
|
|
},
|
|
}],
|
|
[ 'skia_os != "win"', {
|
|
'sources!': [
|
|
'../bench/BenchSysTimer_windows.h',
|
|
'../bench/BenchSysTimer_windows.cpp',
|
|
],
|
|
}],
|
|
['skia_gpu == 1', {
|
|
'sources': [
|
|
'../bench/BenchGpuTimer_gl.h',
|
|
'../bench/BenchGpuTimer_gl.cpp',
|
|
],
|
|
}],
|
|
],
|
|
}
|
|
],
|
|
}
|