Skip to content

GitLab

Switch branch/tag
  1. 18 Jun, 2014 1 commit
    • scroggo's avatar
      In Android framework, make tools depend on jsoncpp · f01a6c36
      scroggo authored 
      Always build the tools with JSON, but either build our own
or use the system's.

Rename skia_build_json_writer to skia_use_system_jsoncpp,
since we now always build with JSON.

Remove SK_BUILD_JSON_WRITER, which was only there so
we could build without JSON it in the framework.

BUG=skia:2448
R=djsollen@google.com, reed@google.com

Author: scroggo@google.com

Review URL: https://codereview.chromium.org/303913002
      f01a6c36
  3. 16 May, 2014 1 commit
    • commit-bot@chromium.org's avatar
      Generate bench/Android.mk from gyp. · 61744ec1
      commit-bot@chromium.org authored 
      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
      61744ec1
  5. 16 Jan, 2014 1 commit
  7. 02 Dec, 2013 1 commit
  9. 13 Nov, 2013 1 commit
  11. 30 Sep, 2013 1 commit
  13. 03 Apr, 2013 1 commit
  15. 22 Mar, 2013 2 commits
  17. 11 Mar, 2013 1 commit
  19. 14 Feb, 2013 1 commit
  21. 13 Feb, 2013 1 commit
  23. 07 Feb, 2013 1 commit
  25. 04 Feb, 2013 1 commit
  27. 15 Jan, 2013 1 commit
  29. 08 Jan, 2013 1 commit
  31. 07 Jan, 2013 1 commit
  33. 19 Dec, 2012 1 commit
  35. 18 Dec, 2012 1 commit