Skip to content

Commit 8521cbb

Browse files
authored
Merge pull request #139 from mono/dev/update-skia-m118
Update skia to Milestone 118
2 parents 5ab716e + db3adf1 commit 8521cbb

File tree

2,019 files changed

+29633
-25338
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,019 files changed

+29633
-25338
lines changed

.bazelignore

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
infra/bots/.recipe_deps

.bazelrc

+3-5
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,6 @@ build --flag_alias=disable_native_interface=no//src/gpu/ganesh/gl:enable_native_
6363
build --flag_alias=enable_native_interface=//src/gpu/ganesh/gl:enable_native_interface
6464
build --flag_alias=disable_pdf_backend=no//src/pdf:enable_pdf_backend
6565
build --flag_alias=enable_pdf_backend=//src/pdf:enable_pdf_backend
66-
build --flag_alias=disable_sksl=no//src/sksl:enable_sksl
67-
build --flag_alias=enable_sksl=//src/sksl:enable_sksl
6866
build --flag_alias=disable_skslc=no//src/sksl:enable_skslc
6967
build --flag_alias=enable_skslc=//src/sksl:enable_skslc
7068
build --flag_alias=disable_sksl_tracing=no//src/sksl:enable_sksl_tracing
@@ -133,9 +131,9 @@ build:remote --spawn_strategy=remote,sandboxed
133131
# Enable remote execution so actions are performed on the remote systems.
134132
build:remote --remote_executor=grpcs://remotebuildexecution.googleapis.com
135133

136-
# No compile task should take more than 180 seconds. Really long running tasks
137-
# are probably a result of spinning up new workers.
138-
build:remote --remote_timeout=180
134+
# Some long running tasks are linking because the workers have relatively little RAM
135+
# (at least as of now).
136+
build:remote --remote_timeout=300
139137

140138
# Enable authentication. This will pick up application default credentials by
141139
# default. You can use --google_credentials=some_file.json to use a service

.disabled.go.mod

+64-4
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,78 @@
11
module go.skia.org/skia
22

3-
go 1.12
3+
go 1.18
44

55
require (
66
cloud.google.com/go/pubsub v1.8.3
77
cloud.google.com/go/storage v1.14.0
8-
github.com/bazelbuild/remote-apis-sdks v0.0.0-20201120151053-8f976b9bf4fc // indirect
98
github.com/flynn/json5 v0.0.0-20160717195620-7620272ed633
109
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
1110
github.com/google/uuid v1.1.2
12-
github.com/klauspost/compress v1.11.3 // indirect
1311
github.com/stretchr/testify v1.7.0
1412
go.chromium.org/luci v0.0.0-20201121231857-b9ab316d7198 // indirect
15-
go.skia.org/infra v0.0.0-20230807174633-333a87d1ef8a
13+
go.skia.org/infra v0.0.0-20230904042911-f5590cb5133d
1614
google.golang.org/api v0.74.0
1715
google.golang.org/protobuf v1.28.0
1816
)
17+
18+
require (
19+
cloud.google.com/go v0.100.2 // indirect
20+
cloud.google.com/go/compute v1.5.0 // indirect
21+
cloud.google.com/go/iam v0.3.0 // indirect
22+
cloud.google.com/go/logging v1.1.1 // indirect
23+
cloud.google.com/go/secretmanager v1.4.0 // indirect
24+
github.com/aclements/go-moremath v0.0.0-20190830160640-d16893ddf098 // indirect
25+
github.com/bazelbuild/remote-apis v0.0.0-20201209220655-9e72daff42c9 // indirect
26+
github.com/bazelbuild/remote-apis-sdks v0.0.0-20201120151053-8f976b9bf4fc // indirect
27+
github.com/beorn7/perks v1.0.1 // indirect
28+
github.com/cenkalti/backoff v2.2.1+incompatible // indirect
29+
github.com/cespare/xxhash/v2 v2.1.2 // indirect
30+
github.com/danjacques/gofslock v0.0.0-20200623023034-5d0bd0fa6ef0 // indirect
31+
github.com/davecgh/go-spew v1.1.1 // indirect
32+
github.com/fiorix/go-web v1.0.1-0.20150221144011-5b593f1e8966 // indirect
33+
github.com/go-chi/chi/v5 v5.0.8 // indirect
34+
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
35+
github.com/golang/mock v1.6.0 // indirect
36+
github.com/golang/protobuf v1.5.2 // indirect
37+
github.com/google/go-cmp v0.5.7 // indirect
38+
github.com/googleapis/gax-go/v2 v2.3.0 // indirect
39+
github.com/hashicorp/errwrap v1.1.0 // indirect
40+
github.com/hashicorp/go-multierror v1.1.0 // indirect
41+
github.com/iancoleman/orderedmap v0.0.0-20190318233801-ac98e3ecb4b0 // indirect
42+
github.com/invopop/jsonschema v0.7.0 // indirect
43+
github.com/jcgregorio/logger v0.1.3 // indirect
44+
github.com/jcgregorio/slog v0.0.0-20190423190439-e6f2d537f900 // indirect
45+
github.com/julienschmidt/httprouter v1.3.0 // indirect
46+
github.com/klauspost/compress v1.11.3 // indirect
47+
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
48+
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
49+
github.com/pborman/uuid v1.2.1 // indirect
50+
github.com/pkg/errors v0.9.1 // indirect
51+
github.com/pmezard/go-difflib v1.0.0 // indirect
52+
github.com/prometheus/client_golang v1.11.1 // indirect
53+
github.com/prometheus/client_model v0.2.0 // indirect
54+
github.com/prometheus/common v0.26.0 // indirect
55+
github.com/prometheus/procfs v0.6.0 // indirect
56+
github.com/smartystreets/goconvey v1.8.1 // indirect
57+
github.com/stretchr/objx v0.3.0 // indirect
58+
github.com/texttheater/golang-levenshtein v1.0.1 // indirect
59+
github.com/willf/bitset v1.1.11 // indirect
60+
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
61+
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
62+
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
63+
github.com/zeebo/bencode v1.0.0 // indirect
64+
go.opencensus.io v0.23.0 // indirect
65+
golang.org/x/net v0.8.0 // indirect
66+
golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a // indirect
67+
golang.org/x/sync v0.2.0 // indirect
68+
golang.org/x/sys v0.6.0 // indirect
69+
golang.org/x/text v0.8.0 // indirect
70+
golang.org/x/time v0.0.0-20220609170525-579cf78fd858 // indirect
71+
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
72+
google.golang.org/appengine v1.6.7 // indirect
73+
google.golang.org/genproto v0.0.0-20220426171045-31bebdecfb46 // indirect
74+
google.golang.org/grpc v1.45.0 // indirect
75+
gopkg.in/fsnotify.v1 v1.4.7 // indirect
76+
gopkg.in/yaml.v2 v2.4.0 // indirect
77+
gopkg.in/yaml.v3 v3.0.1 // indirect
78+
)

0 commit comments

Comments
 (0)