AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
21,270 Commits 1 Branch 0 Tags 544 MiB
e2a88f244a
Commit Graph

191 Commits

Author SHA1 Message Date
borenet
51b56c9041 Move llvm from deps to deps_os 
Re-upload of https://codereview.chromium.org/1721943003/

TBR=bsalomon
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1782793003

Review URL: https://codereview.chromium.org/1782793003
 2016-03-10 05:49:48 -08:00
yujieqin
412f534563 Update DNG SDK version. 
* Integrate integer overflow changes from security branch

BUG=b/26535130
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1748363004

Committed: https://skia.googlesource.com/skia/+/be2924ad17d47f4ed49666894d87571a28f89567

Committed: https://skia.googlesource.com/skia/+/62c0f75159674087079140e09ef1396316577754

Review URL: https://codereview.chromium.org/1748363004
 2016-03-08 11:47:31 -08:00
bsalomon
de7bbab699 Pull and build shaderc rather than use checked in lib/header 
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1760493003

Committed: https://skia.googlesource.com/skia/+/7d4490ecfa4d974003f675ef004e77f85ecfadd2

Review URL: https://codereview.chromium.org/1760493003
 2016-03-03 15:43:04 -08:00
yujieqin
99354b81c3 Revert of Update DNG SDK version. (patchset #4 id:60001 of https://codereview.chromium.org/1748363004/ ) 
Reason for revert:
Sorry for breaking the build again...

Original issue's description:
> Update DNG SDK version.
>
> * Integrate integer overflow changes from security branch
>
> BUG=b/26535130
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1748363004
>
> Committed: https://skia.googlesource.com/skia/+/be2924ad17d47f4ed49666894d87571a28f89567
>
> Committed: https://skia.googlesource.com/skia/+/62c0f75159674087079140e09ef1396316577754

TBR=msarett@google.com,scroggo@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=b/26535130

Review URL: https://codereview.chromium.org/1755283004
 2016-03-03 06:56:19 -08:00
yujieqin
62c0f75159 Update DNG SDK version. 
* Integrate integer overflow changes from security branch

BUG=b/26535130
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1748363004

Committed: https://skia.googlesource.com/skia/+/be2924ad17d47f4ed49666894d87571a28f89567

Review URL: https://codereview.chromium.org/1748363004
 2016-03-03 06:41:48 -08:00
Eric Boren
b5f0d40935 Revert "Pull and build shaderc rather than use checked in lib/header" 
This reverts commit 7d4490ecfa.

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1757253002

Review URL: https://codereview.chromium.org/1757253002 .
 2016-03-03 08:01:33 -05:00
bsalomon
7d4490ecfa Pull and build shaderc rather than use checked in lib/header 
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1760493003

Review URL: https://codereview.chromium.org/1760493003
 2016-03-02 15:59:24 -08:00
yujieqin
62c9c4ba61 Revert of Update DNG SDK version. (patchset #3 id:40001 of https://codereview.chromium.org/1748363004/ ) 
Reason for revert:
This breaks the ChromeOS build. E.g. https://build.chromium.org/p/client.skia.compile/builders/Build-Ubuntu-GCC-x86_64-Release-CrOS_Link/builds/5215/steps/build%20most/logs/stdio

Original issue's description:
> Update DNG SDK version.
>
> * Integrate integer overflow changes from security branch
>
> BUG=b/26535130
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1748363004
>
> Committed: https://skia.googlesource.com/skia/+/be2924ad17d47f4ed49666894d87571a28f89567

TBR=msarett@google.com,scroggo@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=b/26535130

Review URL: https://codereview.chromium.org/1755743003
 2016-03-02 04:57:09 -08:00
yujieqin
be2924ad17 Update DNG SDK version. 
* Integrate integer overflow changes from security branch

BUG=b/26535130
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1748363004

Review URL: https://codereview.chromium.org/1748363004
 2016-03-02 03:30:38 -08:00
yujieqin
cf16e67f84 Update PIEX: Prepares support for uncompressed thumbnails 
The new version of PIEX added new API for adding support to thumbnails. It also marks some old API as deprecate.

BUG=b/26894354
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1723123002

Review URL: https://codereview.chromium.org/1723123002
 2016-02-23 06:18:14 -08:00
msarett
91c22b2ea6 Use new jpeg_crop_scanlines() API to optimize jpeg subset decodes 
This was adapted from:
https://codereview.chromium.org/1530933003

Subset Decode Runtime (Original / Optimized) on Nexus 6P
TopLeft     0.51x
TopRight    0.56x
Middle      0.71x
BottomLeft  0.79x
BottomRight 0.79x

BUG=skia:4256
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1719073002

Review URL: https://codereview.chromium.org/1719073002
 2016-02-22 12:27:46 -08:00
msarett
740668d907 Update libpng to 1.6.22beta 
Intel SSE filter optimizations have been upstreamed.  Let's test on
the upstream version (which we can use in Android).

BUG=skia:4573
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1710083007

Review URL: https://codereview.chromium.org/1710083007
 2016-02-19 11:14:43 -08:00
scroggo
77b798ce8e Update the version of libpng used by Skia tests 
The version of libpng we were using has some security vulnerabilities.
Update to a newer version - 1.6.20 (047737496a/).

Update pnglibconf.h. The new version is a copy of the newer version of
the file, with our /* custom settings */ tacked onto the end. (The
custom settings are unchanged from the last version.)

Update the LICENSE. The new version is a copy of the LICENSE that
libpng now includes as a separate file.

Update the README file to reflect the change in source of the LICENSE
file.

BUG=skia:4573
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1453373003

Review URL: https://codereview.chromium.org/1453373003
 2016-02-19 06:33:07 -08:00
yujieqin
879adccf60 Update PIEX version. This should solve the stack buffer overflow issue 
BUG=skia:4902
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1690853003

Review URL: https://codereview.chromium.org/1690853003
 2016-02-17 06:12:12 -08:00
mtklein
0da8537555 MSAN: build libc++ with MSAN, link to it. 
The errors that we see should now change to the unexplainable,
rather than the explainable errors at head.

We suspect that the original reason to blacklist was this,
not building libc++ with MSAN.  So unblacklist everything to start fresh.

BUG=skia:4903,skia:4900

GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1694353004

Review URL: https://codereview.chromium.org/1694353004
 2016-02-16 14:03:15 -08:00
msarett
dae774eff4 Sync DEPS to clang compatible arm v8 assembly for libjpeg-turbo 
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1697623002

Review URL: https://codereview.chromium.org/1697623002
 2016-02-12 13:06:30 -08:00
mtklein
c089ba5d69 followups 
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1693823005

Review URL: https://codereview.chromium.org/1693823005
 2016-02-12 12:58:10 -08:00
mtklein
013475a272 Put all XSAN bots on the same DEPS-sourced build of Clang. 
This adds LLVM, Clang, and compiler-rt (*san tools) to DEPS,
then uses them from xsan_build, building them if needed.

This is similar to how the CMake bots bootstrap CMake if needed.

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1693733003

Review URL: https://codereview.chromium.org/1693733003
 2016-02-12 12:15:23 -08:00
mtklein
4e79f33452 msan: build expat from source 
This should let us test it on the MSAN bot.

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1674053002

CQ_EXTRA_TRYBOTS=client.skia:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN-Trybot

Review URL: https://codereview.chromium.org/1674053002
 2016-02-07 13:31:23 -08:00
halcanary
7a76f9c8f4 SkMojo: test linking Skia against the Mojo SDK 
TODO: build on systems other than Linux.

Add mojo_skd to the DEPS.

Add a DM::Via called `mojo-`.

everything is hidden behind the gyp variable `skia_mojo`.
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1644043003

Review URL: https://codereview.chromium.org/1644043003
 2016-02-03 11:53:19 -08:00
bungeman
84de5c86f9 Roll third_party/externals/gyp 08429da795..87ac4d0e63fc (63 commits). 
08429da795..87ac4d0e63

This is primarily to pick up changes to the CMake generator for Mac.

Review URL: https://codereview.chromium.org/1669503003
 2016-02-03 11:25:26 -08:00
yujieqin
8f9447cf60 Update the dng_sdk version. The new version handles the posix_memalign() better 
Remove the '-DNO_POSIX_MEMALIGN'
With this change, most new Android (API>=17) should be able to use posix_memalign()

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1655933002

Review URL: https://codereview.chromium.org/1655933002
 2016-02-03 00:50:10 -08:00
yujieqin
076d83d09a Enable RAW codec for Windows 
* Use new DNG SDK version from ASOP, which fixed some build issues.
* Fix SkRawCodec.
* Fix gyp files.

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1641533004

Review URL: https://codereview.chromium.org/1641533004
 2016-01-27 08:25:53 -08:00
yujieqin
8f5175842d Update DEPS to use new PIEX version from AOSP. 
Highlight:
* Better support for reading GPS tags

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1646433003

Review URL: https://codereview.chromium.org/1646433003
 2016-01-27 07:32:43 -08:00
yujieqin
916de9ff18 Add RAW decoding into Skia. 
TBR=reed@google.com

BUG=skia:

(Based on the work from ebrauer in https://codereview.chromium.org/1459473007)
(Based on the work from adaubert in https://codereview.chromium.org/1494003003)
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1520403003

Committed: https://skia.googlesource.com/skia/+/6bd8639f8c142eedf543f4e5f3b02d2bf11df308

Review URL: https://codereview.chromium.org/1520403003
 2016-01-25 08:26:16 -08:00
msarett
c85a9fde77 Revert of Prototype of RAW decoding in Skia. (patchset #32 id:610001 of https://codereview.chromium.org/1520403003/ ) 
Reason for revert:
A few build failures on Chrome OS/Android.

Original issue's description:
> Add RAW decoding into Skia.
>
> TBR=reed@google.com
>
> BUG=skia:
>
> (Based on the work from ebrauer in https://codereview.chromium.org/1459473007)
> (Based on the work from adaubert in https://codereview.chromium.org/1494003003)
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1520403003
>
> Committed: https://skia.googlesource.com/skia/+/6bd8639f8c142eedf543f4e5f3b02d2bf11df308

TBR=scroggo@google.com,adaubert@google.com,yujieqin@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:

Review URL: https://codereview.chromium.org/1635443002
 2016-01-25 06:05:19 -08:00
yujieqin
6bd8639f8c Add RAW decoding into Skia. 
TBR=reed@google.com

BUG=skia:

(Based on the work from ebrauer in https://codereview.chromium.org/1459473007)
(Based on the work from adaubert in https://codereview.chromium.org/1494003003)
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1520403003

Review URL: https://codereview.chromium.org/1520403003
 2016-01-25 05:29:03 -08:00
joshualitt
e36d40e7fd Update deps to pull microhttpd 
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1620813004

Review URL: https://codereview.chromium.org/1620813004
 2016-01-22 11:17:46 -08:00
scroggo
0ac723b6f4 Update libwebp to version 0.5.0 
This is the version used by Android.
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1601253003

Review URL: https://codereview.chromium.org/1601253003
 2016-01-22 06:58:27 -08:00
benjaminwagner
e83c8ebbc4 Revert of Update libwebp to version 0.5.0 (patchset #2 id:20001 of https://codereview.chromium.org/1601253003/ ) 
Reason for revert:
Seems to be causing bots to fail:
https://build.chromium.org/p/client.skia.compile/builders/Build-Ubuntu-GCC-Arm7-Release-Android_NoNeon/builds/4032
https://build.chromium.org/p/client.skia.android/builders/Perf-Android-GCC-Nexus5-CPU-NEON-Arm7-Release/builds/3239
https://build.chromium.org/p/client.skia.android/builders/Perf-Android-GCC-Nexus5-GPU-Adreno330-Arm7-Release/builds/1887
https://build.chromium.org/p/client.skia.fyi/builders/Perf-Android-GCC-Nexus5-GPU-Adreno330-Arm7-Release-Appurify/builds/2075
https://build.chromium.org/p/client.skia.android/builders/Test-Android-GCC-Nexus5-CPU-NEON-Arm7-Debug/builds/2136
https://build.chromium.org/p/client.skia.android/builders/Test-Android-GCC-Nexus5-CPU-NEON-Arm7-Release/builds/3850
https://build.chromium.org/p/client.skia.android/builders/Test-Android-GCC-Nexus5-GPU-Adreno330-Arm7-Debug/builds/2078
https://build.chromium.org/p/client.skia.android/builders/Test-Android-GCC-Nexus5-GPU-Adreno330-Arm7-Release/builds/2000
https://build.chromium.org/p/client.skia.compile/builders/Build-Ubuntu-GCC-Arm7-Debug-Android_NoNeon/builds/4098

Original issue's description:
> Update libwebp to version 0.5.0
>
> This is the version used by Android.
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1601253003
>
> Committed: https://skia.googlesource.com/skia/+/fe35455210294c3d9de9d0d9534743acfade523d

TBR=msarett@google.com,scroggo@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true

Review URL: https://codereview.chromium.org/1601083004
 2016-01-19 09:50:17 -08:00
scroggo
fe35455210 Update libwebp to version 0.5.0 
This is the version used by Android.
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1601253003

Review URL: https://codereview.chromium.org/1601253003
 2016-01-19 08:54:18 -08:00
djsollen
950e626fb4 Update our version of jsoncpp to fix a memory alignment bug in the library. 
This upgrades the library to 1.0.0 instead of the most recent release, since more recent releases require exceptions to be enabled.

BUG=skia:4775
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1575973003

Review URL: https://codereview.chromium.org/1575973003
 2016-01-11 11:36:33 -08:00
msarett
5c2cbf23bb Cherry pick one more commit into libjpeg-turbo 
I forgot to add the last fix for the skip scanlines patch.

BUG=skia:

Review URL: https://codereview.chromium.org/1476483002
 2015-11-24 07:14:35 -08:00
msarett
266f24aa94 Switch Skia's libjpeg-turbo to 1.4.2 
The Android security team wants Android to be on the latest version
of libjpeg-turbo, so Skia should test on this version as well.

This shouldn't affect Gold.

I wouldn't be surprised if this causes a few ASAN/valgrind issues
that we need to fix.

BUG=skia:

Committed: https://skia.googlesource.com/skia/+/8e8eda9d4d2e6e65e3339eaaaf8144a4ef6c721c

Review URL: https://codereview.chromium.org/1469553002
 2015-11-23 11:09:14 -08:00
msarett
4b9596109a Revert of Switch Skia's libjpeg-turbo to 1.4.2 (patchset #2 id:160001 of https://codereview.chromium.org/1469553002/ ) 
Reason for revert:
Breaking jpeg decodes everywhere.  I need to look into this.

Original issue's description:
> Switch Skia's libjpeg-turbo to 1.4.2
>
> The Android security team wants Android to be on the latest version
> of libjpeg-turbo, so Skia should test on this version as well.
>
> This shouldn't affect Gold.
>
> I wouldn't be surprised if this causes a few ASAN/valgrind issues
> that we need to fix.
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/8e8eda9d4d2e6e65e3339eaaaf8144a4ef6c721c

TBR=scroggo@google.com,djsollen@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:

Review URL: https://codereview.chromium.org/1468073002
 2015-11-23 07:25:53 -08:00
msarett
8e8eda9d4d Switch Skia's libjpeg-turbo to 1.4.2 
The Android security team wants Android to be on the latest version
of libjpeg-turbo, so Skia should test on this version as well.

This shouldn't affect Gold.

I wouldn't be surprised if this causes a few ASAN/valgrind issues
that we need to fix.

BUG=skia:

Review URL: https://codereview.chromium.org/1469553002
 2015-11-23 06:34:25 -08:00
halcanary
6950de6c41 Comments Style: s/skbug.com/bug.skia.org/ 
DOCS_PREVIEW= https://skia.org/?cl=1432503003

Review URL: https://codereview.chromium.org/1432503003
 2015-11-07 05:29:00 -08:00
msarett
b747b90501 Remove dependencies on Android's forked decoder libraries 
Disable SkImageDecoder's code which relies on Android's customized
libpng and libjpeg. Build standard versions of libpng and libjpeg-turbo
everywhere. The SkImageDecoder code has been replaced with SkCodec, which
can decode subsets using standard library APIs

BUG=skia:

Review URL: https://codereview.chromium.org/1406153015
 2015-11-06 11:15:49 -08:00
halcanary
21adcb9fa0 DEPS: roll zlib: 20 new commits 
List of changes at
4ba7cdd0e7..c4e33043fb

Of particular interest is
"Fix VC++ 2015 64-bit truncation warning in zlib".

Review URL: https://codereview.chromium.org/1416043007
 2015-10-30 08:40:55 -07:00
joshualitt
b5068fce36 Update deps to pull sdl 
BUG=skia:

Review URL: https://codereview.chromium.org/1425033003
 2015-10-28 13:28:54 -07:00
hendrikw
aef4971443 skia: Roll latest angle 
Required to fix a mac build error with command buffer, and possible
memory allocation issue when used with skia_angle on linux.

Review URL: https://codereview.chromium.org/1413403005
 2015-10-27 13:34:31 -07:00
bungeman
13dd023882 Update Android FreeType version. 
Update FreeType to a newer version. Because this caused issues in
finding the correct ftoptions.h and ftmodule.h [1], be sure to state
the ones we want explicitly.

This also add gzip.c which is needed for WOFF support [2].

[1] FreeType "Simplify header file hierarchy."
    fae382076409db198dfbff36ac4cbb97b05b30a1

[2] FreeType "[gzip] New function `FT_Gzip_Uncompress'."
    dc240524ff31891a442225430b28e9620c1fa89f

Review URL: https://codereview.chromium.org/833103004
 2015-10-27 08:39:39 -07:00
scroggo
f174e92873 Update libwebp and resume testing scaled webp 
libwebp has a fix for [1]. Update to the commit that contains the fix.

Update libwebp.gypi, corresponding to libwebp's latest makefile.

Turn back on DM testing for scaled webp, now that it should no longer
use uninitialized memory.

[1] https://code.google.com/p/webp/issues/detail?id=254

BUG=skia:4038

Committed: https://skia.googlesource.com/skia/+/0575d3e6c272744a66ab3281f9871366717df339

Review URL: https://codereview.chromium.org/1280073002
 2015-10-01 10:56:08 -07:00
hendrikw
03ba61436b skia: roll ANGLE and remove compile flags 
Recent angle change allows us to remove some of the ANGLE specific
compile flags

Review URL: https://codereview.chromium.org/1376803003
 2015-09-29 10:30:31 -07:00
hendrikw
caf2df8608 skia: ANGLE roll 
Review URL: https://codereview.chromium.org/1337943008
 2015-09-15 13:47:25 -07:00
mtklein
a22eabedef CMake bot script 
- Add CMake v3.3.1 (latest) to DEPS.
 - Add cmake/bot-cmake.sh to bootstrap CMake then build Skia using that.

Works on my Mac and Linux box, both with no system CMake installation.

CMake will be ~100M on disk.  The first bootstrap takes a couple minutes,
and a no-op re-run of bot-cmake.sh takes 15-20 seconds.  I thought about
having bot-cmake.sh fetch CMake instead of DEPS, but I'm not sure I can
handle updates, etc. as robustly as it can.

This will only work on Linux and Mac.  CMake requires an older CMake on
Windows.  It doesn't have an equivalent ./bootstrap there.  Will have to
think about how Windows bots will work!

BUG=skia:4269

Review URL: https://codereview.chromium.org/1339603003
 2015-09-14 10:02:50 -07:00
msarett
0e6ff3882d Update giflib to 5.1.1 (AOSP hash) 
This also disables warnings in giflib and fixes
compile warnings in icu, in order to fix a skia
bug.

BUG=skia:4220

Review URL: https://codereview.chromium.org/1314633002
 2015-08-24 12:00:15 -07:00
msarett
3011711d5d Revert of Update skia to test with libpng to 1.6.10 (patchset #3 id:60001 of https://codereview.chromium.org/1301523005/ ) 
Reason for revert:
DM is failing on gm tests on Android bots.  Cause is not yet clear.

Original issue's description:
> Update skia to test with libpng to 1.6.10
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/f272bb03df9b86e7ea2cf23fb4d5cc56624e0118

TBR=djsollen@google.com,scroggo@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:

Review URL: https://codereview.chromium.org/1298223002
 2015-08-18 11:36:44 -07:00
msarett
f272bb03df Update skia to test with libpng to 1.6.10 
BUG=skia:

Review URL: https://codereview.chromium.org/1301523005
 2015-08-18 10:46:01 -07:00
mtklein
dcbaa8ab6d Revert of Depend on ETC1 via DEPS instead of a direct third_party checkin. (patchset #1 id:1 of https://codereview.chromium.org/1296253003/ ) 
Reason for revert:
This will make the google3 roll awkward.  Reverting.

Original issue's description:
> Depend on ETC1 via DEPS instead of a direct third_party checkin.
>
> Yes, this does mean we'll check out ~40M of code for 2 files...
>
> I think these trybots are moot... they gclient sync before patching.
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/ca01d179347b5e848ded97c8228b79ffc6b5e7bf

TBR=robertphillips@google.com,djsollen@google.com,mtklein@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:

Review URL: https://codereview.chromium.org/1290913008
 2015-08-17 11:15:00 -07:00