AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
61744ec1d2
skia2/gyp
History
commit-bot@chromium.org 61744ec1d2 Generate bench/Android.mk from gyp. 
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
2014-05-16 13:15:41 +00:00
..
android_deps.gyp Reland "Gyp file changes for the android framework." 2014-02-05 16:35:12 +00:00
android_framework_lib.gyp Updates to gyp files for building Android.mk 2014-02-28 16:07:39 +00:00
android_system.gyp Update DEPS and GYP to use the copy of Android in platform_tools. 2013-05-02 12:27:21 +00:00
angle.gyp Revert of Roll ANGLE. (https://codereview.chromium.org/237173002/) 2014-05-01 20:20:50 +00:00
animator.gyp rename SkPaintParts.* to SkPaintPart.* 2014-04-18 15:14:25 +00:00
apptype_console.gypi Generate tests/Android.mk from gyp 2014-04-28 16:00:30 +00:00
bench.gyp Generate bench/Android.mk from gyp. 2014-05-16 13:15:41 +00:00
bench.gypi Add a new bench that tests a simple image filter DAG. 2014-04-10 16:16:13 +00:00
chromeos_deps.gyp GYP Changes and Scripts for Compiling Skia for ChromeOS 2013-06-11 15:52:19 +00:00
common_conditions.gypi Generate bench/Android.mk from gyp. 2014-05-16 13:15:41 +00:00
common_variables.gypi Generate bench/Android.mk from gyp. 2014-05-16 13:15:41 +00:00
common.gypi Deprecate SaveFlags use in the public SkCanvas API. 2014-04-24 21:51:58 +00:00
core.gyp Reland "Gyp file changes for the android framework." 2014-02-05 16:35:12 +00:00
core.gypi add localmatrix-shader 2014-05-07 22:26:37 +00:00
debugger.gyp Small tweaks to be able to build everything target: 2014-01-08 21:16:14 +00:00
dm.gyp DM: Add --skps. 2014-05-14 17:55:32 +00:00
effects.gyp Remove the comments settings for vim tab width and expansion variables. 2013-12-02 22:23:03 +00:00
effects.gypi remove reference to (deleted) SkKernel33MaskFilter 2014-05-14 17:42:42 +00:00
everything.gyp First pass at a web app that lets you run Skia code and see the results. 2014-03-11 22:57:50 +00:00
experimental.gyp Remove the comments settings for vim tab width and expansion variables. 2013-12-02 22:23:03 +00:00
FileReaderApp.gyp Remove the comments settings for vim tab width and expansion variables. 2013-12-02 22:23:03 +00:00
flags.gyp Remove the comments settings for vim tab width and expansion variables. 2013-12-02 22:23:03 +00:00
fontconfig.gyp Roll fontconfig to 2.11.0 and reenable poppler on mac 2014-01-15 17:24:22 +00:00
freetype.gyp Build Skia for a bare-bones embedded Linux system. 2014-02-24 20:22:34 +00:00
freetype.gypi Sanitizing source files in Housekeeper-Nightly 2013-08-21 07:01:29 +00:00
giflib.gyp Sanitizing source files in Housekeeper-Nightly 2014-02-25 03:05:18 +00:00
gm.gyp Revert of extract some common code from PictureRenderer (https://codereview.chromium.org/273703006/) 2014-05-08 16:23:56 +00:00
gmslides.gypi New GM for testing circle blur optimization 2014-05-07 17:50:03 +00:00
gpu.gyp Enable use of distance fields via SkPaint flag. 2014-03-11 17:07:15 +00:00
gpu.gypi Split GrResource into GrCacheable/GrGpuObject 2014-05-02 21:38:22 +00:00
gputest.gyp Remove the comments settings for vim tab width and expansion variables. 2013-12-02 22:23:03 +00:00
iconv.gyp Sanitizing source files in Housekeeper-Nightly 2013-08-21 07:01:29 +00:00
images.gyp Fix ChromeOS build broken in f84722e477 2014-02-24 21:39:01 +00:00
jsoncpp.gyp Generate bench/Android.mk from gyp. 2014-05-16 13:15:41 +00:00
libjpeg.gyp Build Skia for a bare-bones embedded Linux system. 2014-02-24 20:22:34 +00:00
libpng.gyp Build Skia for a bare-bones embedded Linux system. 2014-02-24 20:22:34 +00:00
libwebp.gyp Fix warnings on Ubuntu13 2014-02-21 20:11:42 +00:00
lua.gyp Build Skia for a bare-bones embedded Linux system. 2014-02-24 20:22:34 +00:00
most.gyp get iOS building again 2014-04-05 01:13:43 +00:00
nacl.gyp Prepare skia for shared library build on android 2013-06-03 12:10:19 +00:00
opts.gyp Remove non-existent header file from Android opts. 2014-05-08 19:41:48 +00:00
pathops_unittest.gyp When solving the cubic line intersection directly fails, use binary search as a fallback. 2014-05-07 15:31:40 +00:00
pathops_unittest.gypi path ops work in progress 2013-10-02 14:49:34 +00:00
pathops.gypi path ops work in progress 2013-09-16 15:55:01 +00:00
pdf.gyp Build Skia for a bare-bones embedded Linux system. 2014-02-24 20:22:34 +00:00
pdf.gypi Remove the comments settings for vim tab width and expansion variables. 2013-12-02 22:23:03 +00:00
pdfviewer_lib.gyp Build Skia for a bare-bones embedded Linux system. 2014-02-24 20:22:34 +00:00
pdfviewer.gyp Remove the comments settings for vim tab width and expansion variables. 2013-12-02 22:23:03 +00:00
pixman_test.gyp Remove the comments settings for vim tab width and expansion variables. 2013-12-02 22:23:03 +00:00
poppler.gyp Add extra warnings to match what Android uses. 2013-11-20 15:13:49 +00:00
ports.gyp Purge SkPurgeableMemoryBlock. 2014-04-01 23:50:53 +00:00
public_headers.gypi remove unused Kernel33MaskFilter 2014-05-12 13:35:55 +00:00
record.gyp Start using type traits in src/record instead of macros. 2014-04-28 16:19:45 +00:00
record.gypi Add a .gypi to insulate Chrome from refactorings in src/record. 2014-04-21 17:08:19 +00:00
SampleApp.gyp get iOS building again 2014-04-05 01:13:43 +00:00
sfnt.gyp Add missing sfnt header files to gyp. 2014-05-09 14:08:28 +00:00
shapeops_demo.gyp Remove the comments settings for vim tab width and expansion variables. 2013-12-02 22:23:03 +00:00
shapeops_edge.gyp Remove the comments settings for vim tab width and expansion variables. 2013-12-02 22:23:03 +00:00
shapeops_tool.gyp Remove the comments settings for vim tab width and expansion variables. 2013-12-02 22:23:03 +00:00
SimpleCocoaApp.gyp Remove the comments settings for vim tab width and expansion variables. 2013-12-02 22:23:03 +00:00
SimpleiOSApp.gyp get iOS building again 2014-04-05 01:13:43 +00:00
skflate.gyp Build Skia for a bare-bones embedded Linux system. 2014-02-24 20:22:34 +00:00
skia_for_chromium_defines.gypi add SK_SUPPORT_LEGACY_SHADER_LOCALMATRIX for chrome 2014-05-13 00:43:44 +00:00
skia_lib.gyp Remove the comments settings for vim tab width and expansion variables. 2013-12-02 22:23:03 +00:00
skpskgr_test.gyp Remove the comments settings for vim tab width and expansion variables. 2013-12-02 22:23:03 +00:00
svg.gyp Remove the comments settings for vim tab width and expansion variables. 2013-12-02 22:23:03 +00:00
tests.gyp Generate tests/Android.mk from gyp 2014-04-28 16:00:30 +00:00
tests.gypi Add pattern matchers for SkRecord 2014-05-05 21:59:52 +00:00
tools.gyp Factor out DumpRecord method from dump_record tool for later use 2014-05-15 16:10:37 +00:00
utils.gyp Revert of extract some common code from PictureRenderer (https://codereview.chromium.org/273703006/) 2014-05-08 16:23:56 +00:00
v8.gyp Factor out a BaseContext from JsContext. 2014-03-04 20:44:32 +00:00
views_animated.gyp Remove dependency of views on angle 2014-04-29 00:38:39 +00:00
views.gyp Remove dependency of views on angle 2014-04-29 00:38:39 +00:00
webtry.gyp Add pathops and capture stderr so we can get SkDebugf output. 2014-04-28 14:56:32 +00:00
xml.gyp Remove the comments settings for vim tab width and expansion variables. 2013-12-02 22:23:03 +00:00
xps.gyp Remove the comments settings for vim tab width and expansion variables. 2013-12-02 22:23:03 +00:00
zlib.gyp Fix valgrind bot errors introduced in f84722e477. 2014-02-25 18:01:37 +00:00