Commit Graph

20 Commits

Author SHA1 Message Date
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