Граф коммитов

66 Коммитов

Автор SHA1 Сообщение Дата
commit-bot@chromium.org 1d146d431a Revert of Roll ANGLE. (https://codereview.chromium.org/237173002/)
Reason for revert:
breaking the buildbots (see http://108.170.220.76:10117/builders/Build-Win7-VS2010-x86-Release-ANGLE/builds/3198).

NOTRY=true

Original issue's description:
> Roll ANGLE.
>
> BUG=skia:2272
>
> Committed: http://code.google.com/p/skia/source/detail?r=14243
>
> Committed: http://code.google.com/p/skia/source/detail?r=14509

R=bsalomon@chromium.org, bsalomon@google.com, geofflang@chromium.org, djsollen@google.com, mtklein@google.com

Author: djsollen@google.com

Review URL: https://codereview.chromium.org/264733006

git-svn-id: http://skia.googlecode.com/svn/trunk@14517 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-01 20:20:50 +00:00
commit-bot@chromium.org 1267219c53 Roll ANGLE.
BUG=skia:2272

Committed: http://code.google.com/p/skia/source/detail?r=14243

R=bsalomon@chromium.org, bsalomon@google.com

Author: geofflang@chromium.org

Review URL: https://codereview.chromium.org/237173002

git-svn-id: http://skia.googlecode.com/svn/trunk@14509 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-01 19:22:22 +00:00
commit-bot@chromium.org 4e3d760af8 roll DEPS/android/jpeg to current master.
R=djsollen@google.com

Author: halcanary@google.com

Review URL: https://codereview.chromium.org/255953003

git-svn-id: http://skia.googlecode.com/svn/trunk@14394 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-28 13:19:40 +00:00
commit-bot@chromium.org 0b17feaa64 Revert of Roll ANGLE. (https://codereview.chromium.org/237173002/)
Reason for revert:
http://skbug.com/2437

Original issue's description:
> Roll ANGLE.
>
> BUG=skia:2272
>
> Committed: http://code.google.com/p/skia/source/detail?r=14243

R=bsalomon@chromium.org, geofflang@chromium.org
TBR=bsalomon@chromium.org, geofflang@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=skia:2272

Author: bsalomon@google.com

Review URL: https://codereview.chromium.org/238863006

git-svn-id: http://skia.googlecode.com/svn/trunk@14248 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-17 21:31:32 +00:00
commit-bot@chromium.org cd66af0ae0 Roll ANGLE.
BUG=skia:2272
R=bsalomon@chromium.org, bsalomon@google.com

Author: geofflang@chromium.org

Review URL: https://codereview.chromium.org/237173002

git-svn-id: http://skia.googlecode.com/svn/trunk@14243 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-17 18:29:06 +00:00
commit-bot@chromium.org fa443be95b Roll ANGLE.
Contains small changes to ANGLE to pass skia tests.

BUG=skia:2272
R=bsalomon@google.com

Author: geofflang@chromium.org

Review URL: https://codereview.chromium.org/235923020

git-svn-id: http://skia.googlecode.com/svn/trunk@14228 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-16 20:31:54 +00:00
commit-bot@chromium.org 0b352ed264 Pull ANGLE's new repository to third_party/external/angle2.
BUG=skia:2272
R=bsalomon@chromium.org, bsalomon@google.com

Author: geofflang@chromium.org

Review URL: https://codereview.chromium.org/239593002

git-svn-id: http://skia.googlecode.com/svn/trunk@14211 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-15 21:11:09 +00:00
commit-bot@chromium.org f84722e477 Build Skia for a bare-bones embedded Linux system.
Motivation:

    I have downloaded a barebones Linux system built for 64-bit ARM
    from linaro.org and a ARMv8 Foundation Model from arm.com to run
    it on.  This will let us build and test Skia on ARM64 before we
    aquire hardware to allow that.  This CL introduces the changes to
    the build files necessary to build Skia on a barebones embedded
    Linux system.  I tested it with the aarch64 GCC compiler provided
    by linaro.org.

Changes:

    Add a "barelinux" target_os for the DEPS file.  Add an optional
    git download of zlib.

    Changes to gyp files: these changes abstract out libpng, libz, and
    giflib so that images.gyp doesn't know whether they are static or
    dynamically linked.  I also add the variables skia_giflib_static,
    skia_libpng_static, skia_zlib_static, and skia_freetype_static,
    all of which default to false but when set to true will override
    the behavior of the giflib, libpng, zlib, and freetype build
    targets to require them to build statically.  Also, the
    skia_no_fontconfig variable turns off use of the fontconfig service.

	Scripts in platform_tools/barelinux/bin:

    arm64_download - this script downloads the Linaro's ARMv8 Aarch64
	toolchain and minimal embedded Linux system as well as ARM's
	foundation model.  The required files are mirrored on Google
	Cloud.  The script then starts a emulated Arm64 Linux system in
	the background.  After the boot is complete, you can SSH into the
	system at port 8022 via user@localhost.  The SSH key will be
	downloaded into the working directery as well.

	download_deps - Uses gclient to download Skia's dependencies for a
    bare Linux system (the normal dependecies plus giflib, libpng, and
    zlib.)

	barelinux_make - this script builds a version of skia that does
    not depend on external libraries, perfect for putting in an
    embedded system running Linux.  Assumes you have run download_deps
    first.

To test:
    To build a barelinux target, use the barelinux_make script.

    To build for a armv8 system: skia_arch_type=arm arm_neon=0 armv7=1
    armv8=1 arm_thumb=0 skia_arch_width=64 and set the CC and CXX
    variables to point at the cross-compiler downloaded by
    arm64_download.

R=djsollen@google.com, scroggo@google.com, borenet@google.com

Author: halcanary@google.com

Review URL: https://codereview.chromium.org/152513007

git-svn-id: http://skia.googlecode.com/svn/trunk@13570 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-02-24 20:22:34 +00:00
commit-bot@chromium.org fa190be48a Roll fontconfig to 2.11.0 and reenable poppler on mac
R=mtklein@google.com, epoger@google.com

Author: vandebo@chromium.org

Review URL: https://codereview.chromium.org/138843002

git-svn-id: http://skia.googlecode.com/svn/trunk@13091 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-15 17:24:22 +00:00
commit-bot@chromium.org b163984ae7 Move v8 into third_party.
BUG=
R=robertphillips@google.com

Author: jcgregorio@google.com

Review URL: https://codereview.chromium.org/116693004

git-svn-id: http://skia.googlecode.com/svn/trunk@12954 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-08 15:14:09 +00:00
commit-bot@chromium.org 30289512f9 Try another GYP DEPS
This one is just before the introduction of the Python 2.7 requirement.

BUG=
R=rmistry@google.com, robertphillips@google.com

Author: borenet@google.com

Review URL: https://codereview.chromium.org/99583004

git-svn-id: http://skia.googlecode.com/svn/trunk@12651 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-12-12 20:55:00 +00:00
borenet@google.com d98b11367b Revert r12648
Review URL: https://codereview.chromium.org/114453002

git-svn-id: http://skia.googlecode.com/svn/trunk@12650 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-12-12 19:58:10 +00:00
commit-bot@chromium.org baf5a3ba7b Update GYP DEPS to obtain VS 2013 support
R=rmistry@google.com

Author: borenet@google.com

Review URL: https://codereview.chromium.org/103893006

git-svn-id: http://skia.googlecode.com/svn/trunk@12648 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-12-12 19:39:04 +00:00
rmistry@google.com d6bab02386 Reverting r12427
git-svn-id: http://skia.googlecode.com/svn/trunk@12428 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-12-02 13:50:38 +00:00
skia.committer@gmail.com 5b39f5ba9c Sanitizing source files in Housekeeper-Nightly
git-svn-id: http://skia.googlecode.com/svn/trunk@12427 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-12-02 13:36:22 +00:00
commit-bot@chromium.org 361270e6b9 move to newer angle
R=robertphillips@google.com

Author: bsalomon@google.com

Review URL: https://codereview.chromium.org/86423002

git-svn-id: http://skia.googlecode.com/svn/trunk@12416 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-11-27 15:43:22 +00:00
bungeman@google.com 556ee8b3ac Roll gyp deps from 1765 to 1796.
This also adds gyp_skia.py which defers to gyp_skia.
This matches Chromium usage and allows parallel gyp-ing
(now the default) to work on Windows.

R=epoger@google.com

Review URL: https://codereview.chromium.org/81073002

git-svn-id: http://skia.googlecode.com/svn/trunk@12350 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-11-21 18:11:14 +00:00
bungeman@google.com 0d00976bd3 Roll gyp from r1684 to r1765.
R=epoger@google.com

Review URL: https://codereview.chromium.org/32963002

git-svn-id: http://skia.googlecode.com/svn/trunk@11892 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-10-21 18:49:43 +00:00
commit-bot@chromium.org 0837bcdafd Adds poppler and dependencies to DEPS. This is a pre-CL for 20220002, and getting DEPS committed first is necessary to get the trybots to run on the larger CL (since the trybots do 'gclient sync' before patching).
R=vandebo@chromium.org, edisonn@google.com, djsollen@chromium.org, bungeman@chromium.org, djsollen@google.com

Author: richardlin@chromium.org

Review URL: https://chromiumcodereview.appspot.com/21945002

git-svn-id: http://skia.googlecode.com/svn/trunk@10521 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-02 19:10:06 +00:00
djsollen@google.com bcc6d7d390 Update freetype to version 2.5.0.1 when building it from source.
R=bungeman@google.com

Review URL: https://codereview.chromium.org/19625006

git-svn-id: http://skia.googlecode.com/svn/trunk@10273 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-07-23 15:51:12 +00:00
borenet@google.com 672222e400 Update gyp DEPS
R=djsollen@google.com

Review URL: https://codereview.chromium.org/19996003

git-svn-id: http://skia.googlecode.com/svn/trunk@10266 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-07-23 14:46:58 +00:00
djsollen@google.com f8f89701ce Roll freetype back to 2.4.9 until Android/NaCL errors are resolved.
R=borenet@google.com, fmalita@google.com

Review URL: https://codereview.chromium.org/19956003

git-svn-id: http://skia.googlecode.com/svn/trunk@10264 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-07-23 13:54:58 +00:00
djsollen@google.com 2e767c35ca Update freetype DEPS to version 2.5 with PNG encoded color bitmap glyphs
R=bungeman@google.com

Review URL: https://codereview.chromium.org/19931003

git-svn-id: http://skia.googlecode.com/svn/trunk@10259 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-07-23 12:22:11 +00:00
edisonn@google.com 2854e24f53 remove podofo from deps
Review URL: https://codereview.chromium.org/18539008

git-svn-id: http://skia.googlecode.com/svn/trunk@9963 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-07-10 17:11:29 +00:00
borenet@google.com 5ec130524e Use "Simple Chrome for Chrome OS Workflow" to build Skia for ChromeOS
(SkipBuildbotRuns) since this isn't used yet.

R=djsollen@google.com

Review URL: https://codereview.chromium.org/17412007

git-svn-id: http://skia.googlecode.com/svn/trunk@9681 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-06-19 15:13:32 +00:00
djsollen@google.com 5065cbe689 revert DEPS for angle until tools are fixed
R=bsalomon@google.com

Review URL: https://codereview.chromium.org/16788003

git-svn-id: http://skia.googlecode.com/svn/trunk@9517 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-06-11 20:16:48 +00:00
djsollen@google.com 7815c9efdf update WebP to a dev version of 0.3.1
This is necessary to pick up a NEON fix for the iOS build.

R=borenet@google.com

Review URL: https://codereview.chromium.org/16318003

git-svn-id: http://skia.googlecode.com/svn/trunk@9516 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-06-11 20:03:50 +00:00
borenet@google.com 05d550ed36 GYP Changes and Scripts for Compiling Skia for ChromeOS
For now, this requires having a complete ChromeOS checkout.

R=djsollen@google.com

Review URL: https://codereview.chromium.org/16099011

git-svn-id: http://skia.googlecode.com/svn/trunk@9505 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-06-11 15:52:19 +00:00
djsollen@google.com 42416ee303 Update DEPS to use only googlesource.com repositories.
R=borenet@google.com, scroggo@google.com

Review URL: https://codereview.chromium.org/16136013

git-svn-id: http://skia.googlecode.com/svn/trunk@9488 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-06-10 15:19:33 +00:00
commit-bot@chromium.org f111851ce4 Add dependency to podofo at skia_ext branch.
R=djsollen@google.com

Author: edisonn@google.com

Review URL: https://chromiumcodereview.appspot.com/16026009

git-svn-id: http://skia.googlecode.com/svn/trunk@9464 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-06-06 18:39:53 +00:00
bungeman@google.com f51e125b94 Update gyp from 1563 to 1643 (take two).
Re-land 9445 (reverted 9448), but add back the libs no longer provided by gyp.


git-svn-id: http://skia.googlecode.com/svn/trunk@9450 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-06-05 18:35:22 +00:00
bungeman@google.com 4609b9ca9d Reverting gyp roll in 9445 due to Windows failures.
git-svn-id: http://skia.googlecode.com/svn/trunk@9448 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-06-05 17:32:27 +00:00
bungeman@google.com 6b98fbb0da Update gyp from 1563 to 1643.
https://codereview.chromium.org/16384005/


git-svn-id: http://skia.googlecode.com/svn/trunk@9445 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-06-05 16:15:15 +00:00
epoger@google.com 0a117be391 Re-land r9059 with empty cityhash.gyp, instead of deleted cityhash.gyp
R=rmistry@google.com

Review URL: https://codereview.chromium.org/15060008/



git-svn-id: http://skia.googlecode.com/svn/trunk@9064 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-05-08 16:04:02 +00:00
epoger@google.com e8d08a0fc2 Roll out r9059 to unbreak bots
git-svn-id: http://skia.googlecode.com/svn/trunk@9060 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-05-08 15:22:36 +00:00
epoger@google.com aaf7343e16 Remove third-party cityhash, unused since r8992
R=djsollen@google.com

Review URL: https://codereview.chromium.org/15027013

git-svn-id: http://skia.googlecode.com/svn/trunk@9059 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-05-08 14:49:50 +00:00
djsollen@google.com 4b32101a15 Update DEPS and GYP to use the copy of Android in platform_tools.
R=borenet@google.com

Review URL: https://codereview.chromium.org/13898019

git-svn-id: http://skia.googlecode.com/svn/trunk@8951 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-05-02 12:27:21 +00:00
commit-bot@chromium.org a936e37cc7 Upstream Android modifications to the image encoders/decoders.
This CL does not update the libjpeg as that change is large enough
to warrant its own CL.


Author: djsollen@google.com

Reviewed By: reed@google.com,robertphillips@google.com,scroggo@google.com

Review URL: https://chromiumcodereview.appspot.com/12604006

git-svn-id: http://skia.googlecode.com/svn/trunk@8155 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-14 14:42:18 +00:00
bungeman@google.com 8e4adb0e01 Update gyp revision.
Now allows out-of-source output directories.


git-svn-id: http://skia.googlecode.com/svn/trunk@7288 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-01-18 21:20:16 +00:00
epoger@google.com 5a5e29e00d Separate our jsoncpp dependency from Chromium's jsoncpp overrides.
BUG=https://code.google.com/p/skia/issues/detail?id=909
Review URL: https://codereview.appspot.com/7098047

git-svn-id: http://skia.googlecode.com/svn/trunk@7187 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-01-15 17:16:51 +00:00
epoger@google.com 0bba6bd78a Replace SkConsistentChecksum with SkCityHash (now including CityHash via DEPS)
Alternative to https://codereview.appspot.com/6847087/ ('Change SkConsistentChecksum to use SuperFastHash')
Review URL: https://codereview.appspot.com/6867060

git-svn-id: http://skia.googlecode.com/svn/trunk@6701 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-12-07 15:12:01 +00:00
borenet@google.com 7158e6acca Improve NaCl support
- Add nacl_make script to build Skia targets for NaCl using gyp
- Add nacl_interface for command-line apps
- Add nacl_sample as front-end for SampleApp
- Add freetype to DEPS
- Various gyp tweaks for NaCl

TODO:
- Implement GL interface
- Implement font host
- Fix plumbing so that SampleApp works properly
Review URL: https://codereview.appspot.com/6671044

git-svn-id: http://skia.googlecode.com/svn/trunk@6245 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-11-01 17:43:44 +00:00
epoger@google.com 11b0dddd59 Revert r6051, re-adding json to DEPS file
Review URL: https://codereview.appspot.com/6816059

git-svn-id: http://skia.googlecode.com/svn/trunk@6202 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-30 16:25:17 +00:00
borenet@google.com c8707d4686 Remove extra dependencies on json-cpp
Review URL: https://codereview.appspot.com/6752052

git-svn-id: http://skia.googlecode.com/svn/trunk@6051 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-23 16:00:02 +00:00
borenet@google.com efb1d77ad2 Build Skia as a static library
- Roll GYP so that we get non-thin archives on Linux
- Add merge_static_libs.py
- Add skia_core_lib target which builds core, ports, opts*, and utils
- Replace dependencies on core/ports/opts/utils with skia_core_libs
- Rename exportable libraries with "skia_"
Review URL: https://codereview.appspot.com/6619049

git-svn-id: http://skia.googlecode.com/svn/trunk@5889 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-10 19:45:51 +00:00
bungeman@google.com 8d25eb138a Roll gyp to 1509 for ninja compatibility.
https://codereview.appspot.com/6588059/


git-svn-id: http://skia.googlecode.com/svn/trunk@5765 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-02 13:40:30 +00:00
borenet@google.com e33073bac8 Revert r5520
Unfortunately, since we can only build ANGLE by including a gypi, and since
gyp cannot process includes conditionally, we *have* to have a build_angle.gypi
file in the third_party/externals/ANGLE/src directory.  We could do a hack
where we create an empty gypi if ANGLE is not checked out, but for now we just
check out ANGLE on all platforms.

git-svn-id: http://skia.googlecode.com/svn/trunk@5521 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-13 14:53:15 +00:00
borenet@google.com 45bfcbcfba Only check out ANGLE on Windows
Review URL: https://codereview.appspot.com/6500118

git-svn-id: http://skia.googlecode.com/svn/trunk@5520 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-13 14:38:04 +00:00
borenet@google.com 623ff0a5f7 Add ANGLE to DEPS, integrate build
Review URL: https://codereview.appspot.com/6494052

git-svn-id: http://skia.googlecode.com/svn/trunk@5387 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-04 16:45:05 +00:00
djsollen@google.com aba0e3b6bc Add JSON dependency to build.
This dependency is a mirror of the one that Chrome
uses to import jsoncpp.
Review URL: https://codereview.appspot.com/6269043

git-svn-id: http://skia.googlecode.com/svn/trunk@4251 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-13 18:21:47 +00:00