Commit Graph

725 Commits

Author SHA1 Message Date
Kevin Lubick
a502878308 [canvaskit] Add support for woff2 fonts
Requested by Flutter. This adds about 80k of code size
due in large part to the brotli decoding logic.

This also updates the check_deps error to point at
a doc on how to create a new GOB mirror.

Brotli version is 1.0.9; the latest as of today.

Change-Id: I1580cb2189ff1205a9bffca3d887ff2b98a4042e
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/333218
Reviewed-by: Ben Wagner <bungeman@google.com>
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Kevin Lubick <kjlubick@google.com>
2020-11-10 15:07:26 +00:00
Martin Vejdarski
ed435953df Fix issues with latest GN
Change-Id: I9490479242a025fa1f5ff84a556ae43d8de4c19a
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/332897
Commit-Queue: Mike Klein <mtklein@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>
2020-11-07 13:55:45 +00:00
Herb Derby
7e581790bf update build for Apple Silicon
You can use this to cross complie from an x86_64 mac if you have
at least XCode12 beta 2 installed, and you set target_cpu = "arm64"
in your gn args.

Change-Id: I3fcdcd162155ac0242c15260994de09177ff2f97
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/328659
Commit-Queue: Herb Derby <herb@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>
2020-11-02 20:06:09 +00:00
Ben Wagner
541601602e Roll freetype 0a3d2bb99b45b72e1d45..40c5681ab92e7db1
0a3d2bb99b..40c5681ab9

More or less 2.10.1 to 2.10.4.

Change-Id: Ide743e911438dc321ce2b02ed7e18f619c7b86f7
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/330107
Reviewed-by: Kevin Lubick <kjlubick@google.com>
Commit-Queue: Ben Wagner <bungeman@google.com>
2020-10-28 16:56:01 +00:00
Mike Klein
40f8107eab remove absl experiment
We've given up on Abseil, and these warnings are annoying:

    ... libtool: warning same member name (libabsl.escaping.o) ...

Bug: skia:10165
Change-Id: I144573206174cbe9b48fce8e86ed22eb4a4e29b3
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/329937
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
2020-10-27 13:45:10 +00:00
Mike Klein
56a6120b0f retry³ absl
This merges the two CLs we've been considering,

    1) the first attempt,
       https://skia-review.googlesource.com/c/skia/+/286070;
    2) the roll to latest Abseil LTS branch,
       https://skia-review.googlesource.com/c/skia/+/323076.

(See also the second attempt,
https://skia-review.googlesource.com/c/skia/+/322976.)

We'll need this working in Google3 or punt like we have for Android.

Bug: skia:10165
Cq-Include-Trybots: luci.skia.skia.primary:Canary-G3
Change-Id: Ifb42c1bb2c5e70848208d17b841cdb67bd36e182
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/323158
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
2020-10-07 01:36:15 +00:00
Mike Klein
3c70f0bf12 Revert "retry retry absl"
This reverts commit 33b42e12ab.

Reason for revert: Google3 roll

Original change's description:
> retry retry absl
>
> Identical to https://skia-review.googlesource.com/c/skia/+/286070.
>
> Bug: skia:10165
> Cq-Include-Trybots: skia/skia.primary:Build-Debian10-Clang-arm-Debug-Chromebook_GLES;skia/skia.primary:Test-Mac10.13-Clang-MacBookPro11.5-CPU-AVX2-x86_64-Release-All-TSAN,Build-Debian10-Clang-arm64-Debug-Android_ASAN
> Change-Id: I0ec9d5f6875768e665f444e1ada211d3da537678
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/322976
> Commit-Queue: Mike Klein <mtklein@google.com>
> Reviewed-by: John Stiles <johnstiles@google.com>

TBR=mtklein@google.com,brianosman@google.com,johnstiles@google.com

Change-Id: I4186e85ede18caebfac59b784700e69bf9401901
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:10165
Cq-Include-Trybots: skia/skia.primary:Build-Debian10-Clang-arm-Debug-Chromebook_GLES;skia/skia.primary:Test-Mac10.13-Clang-MacBookPro11.5-CPU-AVX2-x86_64-Release-All-TSAN
Cq-Include-Trybots: Build-Debian10-Clang-arm64-Debug-Android_ASAN
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/323156
Reviewed-by: Mike Klein <mtklein@google.com>
2020-10-06 17:57:47 +00:00
Mike Klein
33b42e12ab retry retry absl
Identical to https://skia-review.googlesource.com/c/skia/+/286070.

Bug: skia:10165
Cq-Include-Trybots: skia/skia.primary:Build-Debian10-Clang-arm-Debug-Chromebook_GLES;skia/skia.primary:Test-Mac10.13-Clang-MacBookPro11.5-CPU-AVX2-x86_64-Release-All-TSAN,Build-Debian10-Clang-arm64-Debug-Android_ASAN
Change-Id: I0ec9d5f6875768e665f444e1ada211d3da537678
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/322976
Commit-Queue: Mike Klein <mtklein@google.com>
Reviewed-by: John Stiles <johnstiles@google.com>
2020-10-06 16:52:31 +00:00
Jim Van Verth
1b89eb742a Add AMD allocator to D3D12 backend.
Adds base class GrD3DAlloc and GrD3DMemoryAllocator, and a reference
to a GrD3DMemoryAllocator in GrBackendContext and a reference to a
GrD3DAlloc in GrD3DTextureResourceInfo. Internally, we override this
base class to define the AMD memory allocator.

Change-Id: I033924b0247ea330969b1398f25985e7a84aec11
Bug: skia:9935
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/317243
Commit-Queue: Jim Van Verth <jvanverth@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>
2020-09-23 21:22:52 +00:00
skia-autoroll
96a505f840 Roll skcms from b1f9041ffe31 to 069b8f699b59 (1 revision)
https://skia.googlesource.com/skcms.git/+log/b1f9041ffe31..069b8f699b59

2020-09-11 mtklein@google.com mostly pointless rename

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/skcms-skia-autoroll
Please CC scroggo@google.com,mtklein@google.com on the revert to ensure that a human
is aware of the problem.

To report a problem with the AutoRoller itself, please file a bug:
https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/master/autoroll/README.md

Cq-Include-Trybots: luci.chromium.try:linux-blink-rel
Tbr: scroggo@google.com,mtklein@google.com
Change-Id: Iac25b72067f7c5454e1d8ef58ca36c18cbdb85d3
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/316901
Reviewed-by: skia-autoroll <skia-autoroll@skia-public.iam.gserviceaccount.com>
Commit-Queue: skia-autoroll <skia-autoroll@skia-public.iam.gserviceaccount.com>
2020-09-14 17:25:17 +00:00
Julia Lavrova
b6b7fffc35 Reland "Removing ICU dependencies from skparagraph BUILD.gn file"
This reverts commit 05ce2817f2.

Reason for revert: Fixing the build

Original change's description:
> Revert "Removing ICU dependencies from skparagraph BUILD.gn file"
>
> This reverts commit f1711adb1a.
>
> Reason for revert: Build break
>
> Original change's description:
> > Removing ICU dependencies from skparagraph BUILD.gn file
> >
> > (and from the sources, too)
> >
> > Change-Id: I9d8ff51c91aad4b770b1f183c04734d31252b851
> > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/313148
> > Commit-Queue: Julia Lavrova <jlavrova@google.com>
> > Reviewed-by: Ben Wagner <bungeman@google.com>
>
> TBR=bungeman@google.com,jlavrova@google.com
>
> Change-Id: I1fce2436855e3e2a4cb7d1d7204b3ae49fd530e8
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/314540
> Reviewed-by: Julia Lavrova <jlavrova@google.com>
> Commit-Queue: Julia Lavrova <jlavrova@google.com>

TBR=bungeman@google.com,jlavrova@google.com

Change-Id: I13d78d75698df47930adc2514d1328abc556a209
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/316444
Reviewed-by: Kevin Lubick <kjlubick@google.com>
Commit-Queue: Julia Lavrova <jlavrova@google.com>
2020-09-11 18:31:24 +00:00
Jamie Madill
f1003a7758 Port to ANGLE's GN files
Bug: skia:7647
Change-Id: Ic4709817804610783de8ff3d9eaa32f57fb72729
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/313316
Commit-Queue: Mike Klein <mtklein@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>
2020-09-11 15:22:34 +00:00
Jorge Betancourt
646d6c5860 add oboe version 1.4.3 to third_party dependencies for Android's skottie audio player
Change-Id: I756acd1b70ad9b93fd79af6521015829f72318be
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/314356
Commit-Queue: Jorge Betancourt <jmbetancourt@google.com>
Reviewed-by: Heather Miller <hcm@google.com>
2020-09-09 17:39:57 +00:00
Julia Lavrova
05ce2817f2 Revert "Removing ICU dependencies from skparagraph BUILD.gn file"
This reverts commit f1711adb1a.

Reason for revert: Build break

Original change's description:
> Removing ICU dependencies from skparagraph BUILD.gn file
> 
> (and from the sources, too)
> 
> Change-Id: I9d8ff51c91aad4b770b1f183c04734d31252b851
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/313148
> Commit-Queue: Julia Lavrova <jlavrova@google.com>
> Reviewed-by: Ben Wagner <bungeman@google.com>

TBR=bungeman@google.com,jlavrova@google.com

Change-Id: I1fce2436855e3e2a4cb7d1d7204b3ae49fd530e8
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/314540
Reviewed-by: Julia Lavrova <jlavrova@google.com>
Commit-Queue: Julia Lavrova <jlavrova@google.com>
2020-09-01 20:51:33 +00:00
Julia Lavrova
f1711adb1a Removing ICU dependencies from skparagraph BUILD.gn file
(and from the sources, too)

Change-Id: I9d8ff51c91aad4b770b1f183c04734d31252b851
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/313148
Commit-Queue: Julia Lavrova <jlavrova@google.com>
Reviewed-by: Ben Wagner <bungeman@google.com>
2020-09-01 20:35:34 +00:00
Mike Klein
e60e56003b set _XOPEN_SOURCE=0 when building ICU
Today I learned -dD -E is the super-power version of -dM -E.

Change-Id: Ib8f6f426006261638f2a97ed9053bbe228f301bb
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/313166
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
2020-08-25 19:47:37 +00:00
Nikolay Igotti
7e9b563179 Search ICU data on Windows relative to the current module.
Bug: n/a
Change-Id: If2fc09f6fc0a24915b4938c62451c693a9712586
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/311136
Commit-Queue: Derek Sollenberger <djsollen@google.com>
Reviewed-by: Derek Sollenberger <djsollen@google.com>
Reviewed-by: Heather Miller <hcm@google.com>
Reviewed-by: Jim Sproch <jsproch@google.com>
2020-08-20 14:51:42 +00:00
Leon Scroggins III
21706f1d14 Switch Skia's libjpeg-turbo used for testing to Chromium version
Bug: chromium:922430
Bug: b/135180511

Chromium has diverged from upstream libjpeg-turbo in order to take
advantage of SIMD optimizations that have not yet been merged into
upstream. Android is also interested in using these. Switch to the
version with the optimizations in order to test them.

Chromium has its own jconfig.h and jconfigint.h, so ours are never used
after the switch. Remove them. The only Skia-specific modification to
these files was to define flags to enable arithmetic encoding. Move
them to BUILD.gn, so they're still applied. Also remove jsimdcfg.inc,
which is currently unused. (It appears to be only for x86/x64, where we
are not building SIMD anyway.)

Update BUILD.gn to build SIMD files on arm. The existing ones have
moved, and there are new ones to build, too.

Change-Id: I47606609c23be43b319150ffb5a4fe55d8869755
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/311105
Commit-Queue: Leon Scroggins <scroggo@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>
Reviewed-by: Eric Boren <borenet@google.com>
2020-08-18 14:08:15 +00:00
skia-autoroll
4470ba1491 Roll skcms from 8da4cb002cb4 to b1f9041ffe31 (1 revision)
https://skia.googlesource.com/skcms.git/+log/8da4cb002cb4..b1f9041ffe31

2020-07-31 mtklein@google.com allow Gray and RGB profiles to be equal

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/skcms-skia-autoroll
Please CC mtklein@google.com,borenet@google.com on the revert to ensure that a human
is aware of the problem.

To report a problem with the AutoRoller itself, please file a bug:
https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/master/autoroll/README.md

Change-Id: I52534519ef7c092b313ea83ceb5faa59d1af47b6
Cq-Include-Trybots: luci.chromium.try:linux-blink-rel
Tbr: mtklein@google.com,borenet@google.com
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/307166
Reviewed-by: skia-autoroll <skia-autoroll@skia-public.iam.gserviceaccount.com>
Commit-Queue: skia-autoroll <skia-autoroll@skia-public.iam.gserviceaccount.com>
2020-07-31 13:54:35 +00:00
Kevin Lubick
7c8659256b Inclusive language
Bug: 842296
Change-Id: I4564f96d4f179211df19893270ccc222abcdd446
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/305439
Commit-Queue: Kevin Lubick <kjlubick@google.com>
Reviewed-by: Ben Wagner <bungeman@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>
2020-07-24 13:33:53 +00:00
Robert Phillips
98e6447f8a Manually Roll ANGLE from 20eb9be55299 to f6659b3df028 (17 revisions)
20eb9be552..f6659b3df0

ANGLE has updated the structure of their gn files. This CL updates Skia to match.

Change-Id: I20a735bbb3f4f119c5315627118a82d12df3f856
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/305518
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
2020-07-23 16:06:38 +00:00
skia-autoroll
67fd3b8257 Roll skcms from 6982458867c4 to 8da4cb002cb4 (1 revision)
https://skia.googlesource.com/skcms.git/+log/6982458867c4..8da4cb002cb4

2020-07-22 mtklein@google.com add .bazelrc

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/skcms-skia-autoroll
Please CC robertphillips@google.com,mtklein@google.com on the revert to ensure that a human
is aware of the problem.

To report a problem with the AutoRoller itself, please file a bug:
https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/master/autoroll/README.md

Change-Id: I4cedc6985ceb8f05daa7d6282b2a11c8b87b0060
Cq-Include-Trybots: luci.chromium.try:linux-blink-rel
Tbr: robertphillips@google.com,mtklein@google.com
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/304936
Reviewed-by: skia-autoroll <skia-autoroll@skia-public.iam.gserviceaccount.com>
Commit-Queue: skia-autoroll <skia-autoroll@skia-public.iam.gserviceaccount.com>
2020-07-22 00:53:26 +00:00
skia-autoroll
4526665f2b Roll skcms from 3eb9a5ac7e53 to 6982458867c4 (1 revision)
https://skia.googlesource.com/skcms.git/+log/3eb9a5ac7e53..6982458867c4

2020-07-21 mtklein@google.com basic bazel project structure

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/skcms-skia-autoroll
Please CC robertphillips@google.com,mtklein@google.com on the revert to ensure that a human
is aware of the problem.

To report a problem with the AutoRoller itself, please file a bug:
https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/master/autoroll/README.md

Change-Id: Icf23d12eb8fcf49400f593766f28f75a682dc6cd
Cq-Include-Trybots: luci.chromium.try:linux-blink-rel
Tbr: robertphillips@google.com,mtklein@google.com
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/304919
Reviewed-by: skia-autoroll <skia-autoroll@skia-public.iam.gserviceaccount.com>
Commit-Queue: skia-autoroll <skia-autoroll@skia-public.iam.gserviceaccount.com>
2020-07-21 23:50:06 +00:00
skia-autoroll
9e7f73230c Roll skcms from fc0d614b6313 to 3eb9a5ac7e53 (1 revision)
https://skia.googlesource.com/skcms.git/+log/fc0d614b6313..3eb9a5ac7e53

2020-07-21 mtklein@google.com rename build/ ninja/

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/skcms-skia-autoroll
Please CC robertphillips@google.com,mtklein@google.com on the revert to ensure that a human
is aware of the problem.

To report a problem with the AutoRoller itself, please file a bug:
https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/master/autoroll/README.md

Change-Id: I466bf0fb5789614dab7299e54a92f9254ec4469a
Cq-Include-Trybots: luci.chromium.try:linux-blink-rel
Tbr: robertphillips@google.com,mtklein@google.com
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/304877
Reviewed-by: skia-autoroll <skia-autoroll@skia-public.iam.gserviceaccount.com>
Commit-Queue: skia-autoroll <skia-autoroll@skia-public.iam.gserviceaccount.com>
2020-07-21 23:18:06 +00:00
skia-autoroll
c1be15da4d Roll skcms from f73242142ce5 to fc0d614b6313 (1 revision)
https://skia.googlesource.com/skcms.git/+log/f73242142ce5..fc0d614b6313

2020-07-21 mtklein@google.com bake in default bench profiles

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/skcms-skia-autoroll
Please CC robertphillips@google.com,mtklein@google.com on the revert to ensure that a human
is aware of the problem.

To report a problem with the AutoRoller itself, please file a bug:
https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/master/autoroll/README.md

Change-Id: Ia682574e42b35b256f8048745ff5650e87ba4290
Cq-Include-Trybots: luci.chromium.try:linux-blink-rel
Tbr: robertphillips@google.com,mtklein@google.com
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/304798
Reviewed-by: skia-autoroll <skia-autoroll@skia-public.iam.gserviceaccount.com>
Commit-Queue: skia-autoroll <skia-autoroll@skia-public.iam.gserviceaccount.com>
2020-07-21 18:56:08 +00:00
skia-autoroll
3164b4494f Roll skcms from c21106442079 to f73242142ce5 (1 revision)
https://skia.googlesource.com/skcms.git/+log/c21106442079..f73242142ce5

2020-07-16 mtklein@papyrus.localdomain add skcms_TransferFunction_isFooish()

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/skcms-skia-autoroll
Please CC nifong@google.com,mtklein@google.com on the revert to ensure that a human
is aware of the problem.

To report a problem with the AutoRoller itself, please file a bug:
https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/master/autoroll/README.md

Change-Id: I77846e3f984c295e25f7a72c38cdb0002de24a8f
Cq-Include-Trybots: luci.chromium.try:linux-blink-rel
Tbr: nifong@google.com,mtklein@google.com
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/303442
Reviewed-by: skia-autoroll <skia-autoroll@skia-public.iam.gserviceaccount.com>
Commit-Queue: skia-autoroll <skia-autoroll@skia-public.iam.gserviceaccount.com>
2020-07-16 21:50:37 +00:00
skia-autoroll
b7f47e832a Roll skcms from 403d32176ebc to c21106442079 (1 revision)
https://skia.googlesource.com/skcms.git/+log/403d32176ebc..c21106442079

2020-07-16 mtklein@google.com bump emscripten/node

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/skcms-skia-autoroll
Please CC nifong@google.com,mtklein@google.com on the revert to ensure that a human
is aware of the problem.

To report a problem with the AutoRoller itself, please file a bug:
https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/master/autoroll/README.md

Change-Id: I69a2eec2092931706b2519dbb002fde6c1f208c2
Cq-Include-Trybots: luci.chromium.try:linux-blink-rel
Tbr: nifong@google.com,mtklein@google.com
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/303269
Reviewed-by: skia-autoroll <skia-autoroll@skia-public.iam.gserviceaccount.com>
Commit-Queue: skia-autoroll <skia-autoroll@skia-public.iam.gserviceaccount.com>
2020-07-16 20:24:34 +00:00
Greg Daniel
5ee964e2a2 Reland "Roll dawn from 0d52f800a1d1 to b31f5e717e2d (4 revisions)"
This reverts commit 06980dba90.

Reason for revert: probably wrong guess on revert

Original change's description:
> Revert "Roll dawn from 0d52f800a1d1 to b31f5e717e2d (4 revisions)"
> 
> This reverts commit 14fdcdc891.
> 
> Reason for revert: speculative revert to see if this is cause the d3d failures.
> 
> Original change's description:
> > Roll dawn from 0d52f800a1d1 to b31f5e717e2d (4 revisions)
> > 
> > Also includes a build file fix for glslang.
> > 
> > https://dawn.googlesource.com/dawn.git/+log/0d52f800a1d1..b31f5e717e2d
> > 
> > 2020-07-14 enga@chromium.org Remove kMaxBindingsPerGroup limit
> > 2020-07-14 rharrison@chromium.org Roll 5 dependencies
> > 2020-07-14 kainino@chromium.org Skip clang-format on Windows
> > 2020-07-14 cwallez@chromium.org Rolling build dependencies.
> > 
> > Also rolling transitive DEPS:
> >   https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang from 29c9135d06f1 to b481744aea1e
> >   https://chromium.googlesource.com/external/github.com/google/shaderc from 1402ed576596 to 5515d2a0c20c
> > 
> > Change-Id: I8af4c9a0bcd031fde120c9b2108b3bd2c1db0174
> > Bug: None
> > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/302796
> > Reviewed-by: Eric Boren <borenet@google.com>
> > Commit-Queue: Eric Boren <borenet@google.com>
> 
> TBR=borenet@google.com,bsalomon@google.com,cwallez@chromium.org
> 
> Change-Id: Ieae7fe809da0a9b9404da26163c96015f97e9761
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: None
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/302898
> Reviewed-by: Greg Daniel <egdaniel@google.com>
> Commit-Queue: Greg Daniel <egdaniel@google.com>

TBR=borenet@google.com,egdaniel@google.com,bsalomon@google.com,cwallez@chromium.org

# Not skipping CQ checks because this is a reland.

Bug: None
Change-Id: I8aa7e8740eb7c7da2197b3fd19bd19b9d94124cb
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/303018
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>
2020-07-15 19:42:03 +00:00
Greg Daniel
06980dba90 Revert "Roll dawn from 0d52f800a1d1 to b31f5e717e2d (4 revisions)"
This reverts commit 14fdcdc891.

Reason for revert: speculative revert to see if this is cause the d3d failures.

Original change's description:
> Roll dawn from 0d52f800a1d1 to b31f5e717e2d (4 revisions)
> 
> Also includes a build file fix for glslang.
> 
> https://dawn.googlesource.com/dawn.git/+log/0d52f800a1d1..b31f5e717e2d
> 
> 2020-07-14 enga@chromium.org Remove kMaxBindingsPerGroup limit
> 2020-07-14 rharrison@chromium.org Roll 5 dependencies
> 2020-07-14 kainino@chromium.org Skip clang-format on Windows
> 2020-07-14 cwallez@chromium.org Rolling build dependencies.
> 
> Also rolling transitive DEPS:
>   https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang from 29c9135d06f1 to b481744aea1e
>   https://chromium.googlesource.com/external/github.com/google/shaderc from 1402ed576596 to 5515d2a0c20c
> 
> Change-Id: I8af4c9a0bcd031fde120c9b2108b3bd2c1db0174
> Bug: None
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/302796
> Reviewed-by: Eric Boren <borenet@google.com>
> Commit-Queue: Eric Boren <borenet@google.com>

TBR=borenet@google.com,bsalomon@google.com,cwallez@chromium.org

Change-Id: Ieae7fe809da0a9b9404da26163c96015f97e9761
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: None
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/302898
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>
2020-07-15 14:24:02 +00:00
Corentin Wallez
14fdcdc891 Roll dawn from 0d52f800a1d1 to b31f5e717e2d (4 revisions)
Also includes a build file fix for glslang.

https://dawn.googlesource.com/dawn.git/+log/0d52f800a1d1..b31f5e717e2d

2020-07-14 enga@chromium.org Remove kMaxBindingsPerGroup limit
2020-07-14 rharrison@chromium.org Roll 5 dependencies
2020-07-14 kainino@chromium.org Skip clang-format on Windows
2020-07-14 cwallez@chromium.org Rolling build dependencies.

Also rolling transitive DEPS:
  https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang from 29c9135d06f1 to b481744aea1e
  https://chromium.googlesource.com/external/github.com/google/shaderc from 1402ed576596 to 5515d2a0c20c

Change-Id: I8af4c9a0bcd031fde120c9b2108b3bd2c1db0174
Bug: None
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/302796
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
2020-07-15 12:16:50 +00:00
Nigel Tao
c91db040ad Use Wuffs v0.3 by default, not v0.2
This is roll-forward of
https://skia-review.googlesource.com/c/skia/+/298616/

Change-Id: I44d65dcb67555fd76075e2d415d96db82c376cae
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/301756
Commit-Queue: Leon Scroggins <scroggo@google.com>
Reviewed-by: Leon Scroggins <scroggo@google.com>
2020-07-10 16:10:43 +00:00
Mike Klein
313869939d Revert "Use Wuffs v0.3 by default, not v0.2"
This reverts commit 7a3ea55259.

Reason for revert: linker failures rolling to Flutter, e.g

[5594/5828] LINK ./flow_unittests
FAILED: flow_unittests exe.unstripped/flow_unittests 
/b/s/w/ir/cache/goma/client/gomacc ../../buildtools/linux-x64/clang/bin/clang++ -Wl,--fatal-warnings -m64 -fPIC -Wl,-z,noexecstack -Wl,-z,now -Wl,-z,relro -Wl,-z,defs -pthread --sysroot=/b/s/w/ir/cache/builder/src/build/linux/debian_sid_amd64-sysroot -L/b/s/w/ir/cache/builder/src/build/linux/debian_sid_amd64-sysroot/usr/local/lib/x86_64-linux-gnu\ -Wl,-rpath-link=/b/s/w/ir/cache/builder/src/build/linux/debian_sid_amd64-sysroot/usr/local/lib/x86_64-linux-gnu\ -L/b/s/w/ir/cache/builder/src/build/linux/debian_sid_amd64-sysroot/lib/x86_64-linux-gnu\ -Wl,-rpath-link=/b/s/w/ir/cache/builder/src/build/linux/debian_sid_amd64-sysroot/lib/x86_64-linux-gnu\ -L/b/s/w/ir/cache/builder/src/build/linux/debian_sid_amd64-sysroot/usr/lib/x86_64-linux-gnu\ -Wl,-rpath-link=/b/s/w/ir/cache/builder/src/build/linux/debian_sid_amd64-sysroot/usr/lib/x86_64-linux-gnu -Wl,-rpath=\$ORIGIN/ -Wl,-rpath-link= -Wl,--disable-new-dtags  -o ./exe.unstripped/flow_unittests -Wl,--build-id=sha1 -Wl,--start-group @./flow_unittests.rsp  -Wl,--end-group  -ldl -lpthread  && strip --strip-unneeded -o ./flow_unittests ./exe.unstripped/flow_unittests
ld.lld: error: undefined symbol: wuffs_base__note__end_of_data
>>> referenced by SkWuffsCodec.cpp:0 (../../third_party/skia/src/codec/SkWuffsCodec.cpp:0)
>>>               obj/third_party/skia/src/codec/wuffs.SkWuffsCodec.o:(SkWuffsCodec::onGetFrameCountInternal())
clang-11: error: linker command failed with exit code 1 (use -v to see invocation)

https://github.com/flutter/engine/pull/19466
https://ci.chromium.org/p/flutter/builders/try/Linux%20Host%20Engine/9900? (among several)

Original change's description:
> Use Wuffs v0.3 by default, not v0.2
> 
> Change-Id: Ie57fea197778f4b17ca08d2e3022b77f783de927
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/298616
> Reviewed-by: Leon Scroggins <scroggo@google.com>
> Commit-Queue: Mike Klein <mtklein@google.com>

TBR=mtklein@google.com,scroggo@google.com,nigeltao@google.com

# Not skipping CQ checks because original CL landed > 1 day ago.

Change-Id: Ie21293deade92e064099ebd5d41de69dbf8b2545
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/300413
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
2020-07-03 14:41:53 +00:00
Nigel Tao
7a3ea55259 Use Wuffs v0.3 by default, not v0.2
Change-Id: Ie57fea197778f4b17ca08d2e3022b77f783de927
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/298616
Reviewed-by: Leon Scroggins <scroggo@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
2020-07-02 00:36:02 +00:00
John Stiles
b5f7a07b77 Enable OS X clipboard in ImGui.
ImGui gates the OS clipboard behind a #define to avoid forcing ImGui
apps to link against ApplicationServices if they otherwise wouldn't need
to. In our case this is harmless; our tools already link against Cocoa.

This #define is safe to enable on all platforms.

Context:
29d9394a41

Change-Id: Ice5d027ddc0157c0cfe87a7cc0c064c4fa682425
Bug: skia:10338
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/300197
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Auto-Submit: John Stiles <johnstiles@google.com>
2020-07-01 21:33:07 +00:00
Florin Malita
65513a9834 Tweak scripts to fix CK builds with python 3
- print -> print()
- xrange() gone in 3, but range() works similarly - if somewhat
  less efficient in 2
- read() returns strings in python 2 vs. bytes in 3

Change-Id: Ia720551832ef75edbf9235b80a06e2ffa3ddf4b5
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/299444
Commit-Queue: Florin Malita <fmalita@google.com>
Reviewed-by: Kevin Lubick <kjlubick@google.com>
2020-06-29 12:59:05 +00:00
skia-autoroll
345e999a59 Roll dawn from 92379bff49c2 to 8ab3719fc486 (2 revisions)
Also includes GN file fixes for glslang.

https://dawn.googlesource.com/dawn.git/+log/92379bff49c2..8ab3719fc486

2020-06-23 enga@chromium.org Fix validation of multisampled BGL bindings
2020-06-22 rharrison@chromium.org Rolling 4 dependencies

Also rolling transitive DEPS:
  https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang from 00965b9fa9a8 to 839704450200
  https://chromium.googlesource.com/external/github.com/google/shaderc from c2ac70797a38 to caa519ca532a

Change-Id: I46f2d1ed1e137cfc2576fe7da34495f035fdac16
Cq-Include-Trybots: skia/skia.primary:Build-Debian10-Clang-x86_64-Debug-Dawn
Bug: None
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/298437
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
2020-06-24 17:35:33 +00:00
Mike Klein
29cb9f9478 decouple werror and -isystem in third_party
Some users of Skia want to build these with -I instead of -isystem, and
until now we've piggybacked it on werror, but it's still kind of
annoying to see warnings even if they're not fatal.

Change-Id: I5a349b2571adc2f94c75dc17317666ddc2dec373
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/297788
Commit-Queue: Mike Klein <mtklein@google.com>
Commit-Queue: John Stiles <johnstiles@google.com>
Reviewed-by: John Stiles <johnstiles@google.com>
2020-06-19 21:59:35 +00:00
Derek Sollenberger
74b06275bb Manually update ANGLE DEPS
Recent ANGLE changes require BUILD.gn updates to make use of new
zlib functions as well as changes to SystemInfo that requires adding
new source dictionaries to our list of build sources.

Bug: skia:10391
Change-Id: I993a9f78e4585618ad4cd16b3bfc81874d7b5b17
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/297116
Reviewed-by: Ben Wagner <bungeman@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Derek Sollenberger <djsollen@google.com>
2020-06-18 12:50:02 +00:00
Derek Sollenberger
abae40299c Reland "Update zlib DEPS"
This is a reland of 6fb3687413

Original change's description:
> Update zlib DEPS
> 
> Pull latest zlib into Skia and updated its BUILD files to build some
> SIMD variants.
> 
> Bug: skia:10391
> Change-Id: Ic1a660c8f5f7e5f94440787779fd74b7192ab6d5
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/296720
> Auto-Submit: Derek Sollenberger <djsollen@google.com>
> Reviewed-by: Ben Wagner <bungeman@google.com>
> Commit-Queue: Derek Sollenberger <djsollen@google.com>

Bug: skia:10391
Change-Id: I4d38a526f2785e70ef9fa134c681fd3dc4d57c44
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/297020
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Derek Sollenberger <djsollen@google.com>
2020-06-17 17:27:15 +00:00
Derek Sollenberger
1443609db4 Revert "Update zlib DEPS"
This reverts commit 6fb3687413.

Reason for revert: breaking a bunch of linux builds

Change-Id: I71dd154785fb00dd20bc157d5d5daf1ee2101fc2
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/296996
Reviewed-by: Derek Sollenberger <djsollen@google.com>
2020-06-17 13:20:37 +00:00
Derek Sollenberger
6fb3687413 Update zlib DEPS
Pull latest zlib into Skia and updated its BUILD files to build some
SIMD variants.

Bug: skia:10391
Change-Id: Ic1a660c8f5f7e5f94440787779fd74b7192ab6d5
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/296720
Auto-Submit: Derek Sollenberger <djsollen@google.com>
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Derek Sollenberger <djsollen@google.com>
2020-06-17 13:11:53 +00:00
Derek Sollenberger
b48895dca2 Revert "Allow building with Wuffs v0.3, not just v0.2"
This reverts commit c34344989a.

Reason for revert: breaking the windows msvc compile bot as well as the flutter canary

Original change's description:
> Allow building with Wuffs v0.3, not just v0.2
> 
> This is step 1 of a multi-step, multi-repository transition:
> 
> 1. Let Skia work with either Wuffs v0.3 or v0.2. This repository
>    defaults to v0.3 but other repositories' defaults remain at v0.2.
> 2. Update users' Skia version (automatic if they update regularly).
> 3. Update users' Wuffs version and opt them in to Skia-uses-Wuffs-v0.3.
> 4. Flip Skia choosing Wuffs version 0.3 from opt-in to opt-out.
> 5. Remove the option for Skia to work wih Wuffs v0.2.
> 
> Change-Id: Ie5cf238057060f2a40cc7c0070d6e2a076943e2b
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/295976
> Commit-Queue: Leon Scroggins <scroggo@google.com>
> Reviewed-by: Leon Scroggins <scroggo@google.com>

TBR=scroggo@google.com,nigeltao@google.com

Change-Id: I2c8a44962eb9b136b199dba5f52a860d756a0aa1
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/296441
Reviewed-by: Derek Sollenberger <djsollen@google.com>
Commit-Queue: Derek Sollenberger <djsollen@google.com>
2020-06-15 15:41:26 +00:00
Nigel Tao
c34344989a Allow building with Wuffs v0.3, not just v0.2
This is step 1 of a multi-step, multi-repository transition:

1. Let Skia work with either Wuffs v0.3 or v0.2. This repository
   defaults to v0.3 but other repositories' defaults remain at v0.2.
2. Update users' Skia version (automatic if they update regularly).
3. Update users' Wuffs version and opt them in to Skia-uses-Wuffs-v0.3.
4. Flip Skia choosing Wuffs version 0.3 from opt-in to opt-out.
5. Remove the option for Skia to work wih Wuffs v0.2.

Change-Id: Ie5cf238057060f2a40cc7c0070d6e2a076943e2b
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/295976
Commit-Queue: Leon Scroggins <scroggo@google.com>
Reviewed-by: Leon Scroggins <scroggo@google.com>
2020-06-15 14:34:34 +00:00
Mike Klein
d3927e40f1 Revert "Reland "Add JavaInputStreamAdaptor files into third_party directory.""
This reverts commit 237f794e64.

Reason for revert: blocking the Google3 roll.

I think you may need to land third_party/aosp/LICENSE first, set up the BUILD file to point out code in third_party/aosp is covered by third_party/aosp/LICENSE, and then let the code roll in?

Original change's description:
> Reland "Add JavaInputStreamAdaptor files into third_party directory."
> 
> This is a reland of cf8b723ffd
> 
> The reland is necessary to satisfy the google3 roller.
> 
> Original change's description:
> > Add JavaInputStreamAdaptor files into third_party directory.
> >
> > This code needs to be migrated out of the main Skia directory due to its
> > use of the Apache 2.0 license. A followup CL will remove these files
> > from their current home at platform_tools/android/apps/skottie/src/
> > main/cpp.
> >
> > Change-Id: I939b05afcebb29e1deab1d4ae1b38012f719cf7e
> > Bug: skia:10310
> > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/295082
> > Reviewed-by: Ben Wagner <bungeman@google.com>
> > Reviewed-by: Weston Tracey <westont@google.com>
> > Commit-Queue: John Stiles <johnstiles@google.com>
> 
> Bug: skia:10310, skia:10353
> Change-Id: I3ac62b626825df624a5418e496989facef6b6099
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/295201
> Commit-Queue: John Stiles <johnstiles@google.com>
> Reviewed-by: Weston Tracey <westont@google.com>

TBR=bungeman@google.com,westont@google.com,johnstiles@google.com

Change-Id: I7f8de31419d86933a79036b48032c4a7ea18dd3a
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:10310, skia:10353
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/295283
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
2020-06-09 16:55:29 +00:00
John Stiles
237f794e64 Reland "Add JavaInputStreamAdaptor files into third_party directory."
This is a reland of cf8b723ffd

The reland is necessary to satisfy the google3 roller.

Original change's description:
> Add JavaInputStreamAdaptor files into third_party directory.
>
> This code needs to be migrated out of the main Skia directory due to its
> use of the Apache 2.0 license. A followup CL will remove these files
> from their current home at platform_tools/android/apps/skottie/src/
> main/cpp.
>
> Change-Id: I939b05afcebb29e1deab1d4ae1b38012f719cf7e
> Bug: skia:10310
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/295082
> Reviewed-by: Ben Wagner <bungeman@google.com>
> Reviewed-by: Weston Tracey <westont@google.com>
> Commit-Queue: John Stiles <johnstiles@google.com>

Bug: skia:10310, skia:10353
Change-Id: I3ac62b626825df624a5418e496989facef6b6099
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/295201
Commit-Queue: John Stiles <johnstiles@google.com>
Reviewed-by: Weston Tracey <westont@google.com>
2020-06-09 15:31:18 +00:00
John Stiles
9d79ac6b81 Revert "Add JavaInputStreamAdaptor files into third_party directory."
This reverts commit cf8b723ffd.

Reason for revert: reverting and relanding to make the google3
roller happy

Original change's description:
> Add JavaInputStreamAdaptor files into third_party directory.
> 
> This code needs to be migrated out of the main Skia directory due to its
> use of the Apache 2.0 license. A followup CL will remove these files
> from their current home at platform_tools/android/apps/skottie/src/
> main/cpp.
> 
> Change-Id: I939b05afcebb29e1deab1d4ae1b38012f719cf7e
> Bug: skia:10310
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/295082
> Reviewed-by: Ben Wagner <bungeman@google.com>
> Reviewed-by: Weston Tracey <westont@google.com>
> Commit-Queue: John Stiles <johnstiles@google.com>

TBR=bungeman@google.com,westont@google.com,johnstiles@google.com

Change-Id: Ib3cbad92b8c5616735a013d06e3345ac50f78c84
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:10310, skia:10353
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/295200
Reviewed-by: John Stiles <johnstiles@google.com>
Commit-Queue: John Stiles <johnstiles@google.com>
2020-06-09 14:44:04 +00:00
John Stiles
cf8b723ffd Add JavaInputStreamAdaptor files into third_party directory.
This code needs to be migrated out of the main Skia directory due to its
use of the Apache 2.0 license. A followup CL will remove these files
from their current home at platform_tools/android/apps/skottie/src/
main/cpp.

Change-Id: I939b05afcebb29e1deab1d4ae1b38012f719cf7e
Bug: skia:10310
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/295082
Reviewed-by: Ben Wagner <bungeman@google.com>
Reviewed-by: Weston Tracey <westont@google.com>
Commit-Queue: John Stiles <johnstiles@google.com>
2020-06-08 20:08:30 +00:00
John Stiles
7b1355e509 Revert "Reland "Move JavaInputStreamAdaptor into third_party and add a LICENSE file.""
This reverts commit fee069880d.

Reason for revert: google3 roller is glitchy today, try again later

Original change's description:
> Reland "Move JavaInputStreamAdaptor into third_party and add a LICENSE file."
> 
> This is a reland of eac2d518bd
> 
> The aosp folder was added to the google3 roller include_patterns list:
> http://cl/315274044
> 
> Original change's description:
> > Move JavaInputStreamAdaptor into third_party and add a LICENSE file.
> >
> > Change-Id: I723b15fbcf3343559fb5a3fe3015cf3db96e2841
> > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/294696
> > Reviewed-by: Heather Miller <hcm@google.com>
> > Commit-Queue: John Stiles <johnstiles@google.com>
> 
> Change-Id: I27ac16c3ac05fbee1473af886379e95492302d50
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/295000
> Reviewed-by: Heather Miller <hcm@google.com>
> Reviewed-by: John Stiles <johnstiles@google.com>
> Commit-Queue: John Stiles <johnstiles@google.com>

TBR=djsollen@google.com,hcm@google.com,johnstiles@google.com

Change-Id: I8c620c47a8c6c7f3e081fe786a17396a40236105
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/295081
Reviewed-by: John Stiles <johnstiles@google.com>
Commit-Queue: John Stiles <johnstiles@google.com>
2020-06-08 19:18:15 +00:00
John Stiles
fee069880d Reland "Move JavaInputStreamAdaptor into third_party and add a LICENSE file."
This is a reland of eac2d518bd

The aosp folder was added to the google3 roller include_patterns list:
http://cl/315274044

Original change's description:
> Move JavaInputStreamAdaptor into third_party and add a LICENSE file.
>
> Change-Id: I723b15fbcf3343559fb5a3fe3015cf3db96e2841
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/294696
> Reviewed-by: Heather Miller <hcm@google.com>
> Commit-Queue: John Stiles <johnstiles@google.com>

Change-Id: I27ac16c3ac05fbee1473af886379e95492302d50
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/295000
Reviewed-by: Heather Miller <hcm@google.com>
Reviewed-by: John Stiles <johnstiles@google.com>
Commit-Queue: John Stiles <johnstiles@google.com>
2020-06-08 16:44:04 +00:00
John Stiles
429d9d7981 Revert "Move JavaInputStreamAdaptor into third_party and add a LICENSE file."
This reverts commit eac2d518bd.

Reason for revert: google3 roll broke

Original change's description:
> Move JavaInputStreamAdaptor into third_party and add a LICENSE file.
> 
> Change-Id: I723b15fbcf3343559fb5a3fe3015cf3db96e2841
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/294696
> Reviewed-by: Heather Miller <hcm@google.com>
> Commit-Queue: John Stiles <johnstiles@google.com>

TBR=djsollen@google.com,hcm@google.com,johnstiles@google.com

Change-Id: Ia2e23547ad39a0e3d069d9a9807f581b5c73c199
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/294710
Reviewed-by: John Stiles <johnstiles@google.com>
Commit-Queue: John Stiles <johnstiles@google.com>
2020-06-05 21:21:48 +00:00