AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
56,435 Commits 1 Branch 0 Tags 544 MiB
60f3e2a7d5
Commit Graph

4134 Commits

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