Commit Graph

4130 Commits

Author SHA1 Message Date
epoger
133931f4ab roll "common" DEPS, and replace tools/pyutils with it
BUG=skia:2682
R=borenet@google.com

Author: epoger@google.com

Review URL: https://codereview.chromium.org/385783002
2014-07-11 08:52:35 -07:00
jcgregorio
d081cf661a Pin to a newer version of ANGLE than M36 branch.
R=robertphillips@google.com
TBR=robertphillips@google.com

BUG=skia:

NOTRY=true

NOTREECHECKS=true

Author: jcgregorio@google.com

Review URL: https://codereview.chromium.org/390433002
2014-07-11 06:51:59 -07:00
jcgregorio
24969a3146 Pin to a specific version of ANGLE.
Pulling from HEAD is dangerous, as we now know. This change is a temporary fix
to open the tree, we need a system for which version of ANGLE we are pinning to.

BUG=skia:

NOTRY=true

NOTREECHECKS=true
R=robertphillips@google.com

Author: jcgregorio@google.com

Review URL: https://codereview.chromium.org/387893002
2014-07-11 06:30:55 -07:00
epoger
fd429991e9 import google-api-python-client using DEPS
BUG=skia:2641
R=jcgregorio@google.com

Author: epoger@google.com

Review URL: https://codereview.chromium.org/381933002
2014-07-10 09:03:26 -07:00
Eric Boren
bb0ef0a134 Use new common tools in Python scripts
BUG=skia:2682
R=rmistry@google.com

Review URL: https://codereview.chromium.org/330423004
2014-06-25 11:13:27 -04:00
borenet
f6fb36eebc Add DEPS entry for common repo
BUG=skia:
R=reed@google.com, rmistry@google.com

Author: borenet@google.com

Review URL: https://codereview.chromium.org/334633008
2014-06-20 07:55:03 -07:00
Brian Salomon
08fe01362d Try to roll angle again.
BUG=skia:2272

NOTRY=True
NOTREECHECKS=True
R=reed@google.com

Review URL: https://codereview.chromium.org/306483014
2014-06-17 17:28:17 -04:00
mtklein
4aa000df08 Split out DEPS change from 294873004 to land first.
BUG=skia:
R=mtklein@google.com

Author: mtklein@chromium.org

Review URL: https://codereview.chromium.org/331913004
2014-06-16 20:03:43 -07:00
mtklein
1a50651524 Pull in GYP_LINK_CONCURRENCY=N support.
BUG=skia:
R=borenet@google.com, mtklein@google.com

Author: mtklein@chromium.org

Review URL: https://codereview.chromium.org/315183003
2014-06-06 07:37:46 -07:00
bungeman
5d3f9c765f Update gyp for msvs-ninja clean.
BUG=skia:2439
R=borenet@google.com, epoger@google.com

Author: bungeman@google.com

Review URL: https://codereview.chromium.org/317833005
2014-06-05 12:14:44 -07:00
epoger
b144271179 reland "rebaseline_server: download actual-results.json files from GCS instead of SVN"
relands https://codereview.chromium.org/310093003 with modifications.

BUG=skia:2641
R=jcgregorio@google.com

Author: epoger@google.com

Review URL: https://codereview.chromium.org/313343003
2014-06-05 10:30:37 -07:00
bungeman
c3f100b0ff Update gyp for msvs-ninja.
BUG=skia:2439
R=borenet@google.com, epoger@google.com

Author: bungeman@google.com

Review URL: https://codereview.chromium.org/311213002
2014-06-04 11:35:03 -07:00
epoger
55ada0630e download_actuals.py: download JSON files from Google Storage instead of skia-autogen
uses google-api-python-client instead of gsutil binary to interact with Google Storage

BUG=skia:553
R=rmistry@google.com, bensong@google.com

Author: epoger@google.com

Review URL: https://codereview.chromium.org/309653005
2014-06-03 10:35:28 -07:00
commit-bot@chromium.org
3056bdd236 Since we're only using it on Linux now, just require poppler as a system dependency.
The Ubuntu package needed is libpoppler-cpp-dev.

iconv and fontconfig were only used as Poppler dependencies.  bson_c is also unused.

BUG=skia:
R=reed@google.com, rmistry@google.com, borenet@google.com, halcanary@google.com, mtklein@google.com

Author: mtklein@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14802 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-20 15:07:53 +00:00
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
thakis@chromium.org
0379ea275f Update skia's gyp to r1320.
Allows buildilng skia with make on OS X.

BUG=chromium:102033
Review URL: https://codereview.appspot.com/5985066

git-svn-id: http://skia.googlecode.com/svn/trunk@3628 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-04-09 13:57:45 +00:00
bungeman@google.com
2227306aea Update skia's gyp to 1284 (was 1139).
http://codereview.appspot.com/5935050/


git-svn-id: http://skia.googlecode.com/svn/trunk@3525 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-28 18:18:26 +00:00
epoger@google.com
bb2d36dfc9 Add libjpeg source as third_party/externals dependency
Review URL: https://codereview.appspot.com/5773043

git-svn-id: http://skia.googlecode.com/svn/trunk@3334 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-07 17:15:54 +00:00
bungeman@google.com
81f41d75cd Roll gyp to 1139.
http://codereview.appspot.com/5529070/


git-svn-id: http://skia.googlecode.com/svn/trunk@3017 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-01-11 19:17:20 +00:00
bungeman@google.com
983297e813 Roll gyp and add librarian settings (now supported).
http://codereview.appspot.com/5169048/


git-svn-id: http://skia.googlecode.com/svn/trunk@2397 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-10-03 19:36:51 +00:00
epoger@google.com
06546d81f2 gyp DEPS roll, and remove no-longer-needed msvs_abspath_output flag
git-svn-id: http://skia.googlecode.com/svn/trunk@2115 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-08-15 19:53:17 +00:00
epoger@google.com
2e7de5a1a7 revert r2110, which broke Mac builds
git-svn-id: http://skia.googlecode.com/svn/trunk@2111 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-08-15 17:12:59 +00:00
epoger@google.com
3f0254da54 Update gyp so that we no longer need msvs_abspath_output generator flag.
Review URL: http://codereview.appspot.com/4905044

git-svn-id: http://skia.googlecode.com/svn/trunk@2110 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-08-15 17:04:51 +00:00
epoger@google.com
0fb2125814 enable "make XXX" command-line builds on Windows
http://codereview.appspot.com/4717044/



git-svn-id: http://skia.googlecode.com/svn/trunk@1853 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-13 21:30:14 +00:00
epoger@google.com
e620ad299f Revert r1768
git-svn-id: http://skia.googlecode.com/svn/trunk@1771 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-06-30 21:03:02 +00:00
epoger@google.com
72798e4808 Roll gyp version from 907 to 936
git-svn-id: http://skia.googlecode.com/svn/trunk@1768 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-06-30 16:51:49 +00:00
epoger@google.com
3cbd375350 roll back runhooks to fix production buildbot
git-svn-id: http://skia.googlecode.com/svn/trunk@1618 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-06-16 18:24:11 +00:00
epoger@google.com
0045eddac6 Add "runhooks" to run gyp step upon gclient sync, for buildbot
git-svn-id: http://skia.googlecode.com/svn/trunk@1617 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-06-16 18:19:46 +00:00
epoger@google.com
8cdb78c4fd set externals/gyp dependency to same version as manually imported gyp code
git-svn-id: http://skia.googlecode.com/svn/trunk@1571 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-06-13 18:45:15 +00:00
epoger@google.com
cc9cf9ac6e Modify DEPS so that it works properly for the buildbot
git-svn-id: http://skia.googlecode.com/svn/trunk@1570 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-06-13 18:08:41 +00:00
epoger@google.com
fc0685652e Add DEPS file in an attempt to make both gclient and svn update bring in
third_party/externals.



git-svn-id: http://skia.googlecode.com/svn/trunk@1566 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-06-13 16:04:25 +00:00