Commit 85e22fc
Build Android Framework host library on Mac
Based on ag/5616352, patch set 5.
Bug: b/118742766
Test: lunch sdk && mmma external/skia on Mac
Similar to the linux build, use a new set of GN arguments to create a
json object to fill in the updated template.
Add the new include/config/mac folder for the newly generated mac-
specific SkUserConfig.h.
Include stdarg.h in SkTraceEventCommon, which is necessary for the mac
build.
Add a new GN arg (skia_use_fonthost_mac) to allow framework build to
manually not build SkFontHost_mac.cpp, and use the same font host
as the other builds.
Change-Id: I654ba496306a3f3591c3937ad5524cd45e49dd65
Reviewed-on: https://skia-review.googlesource.com/c/173183
Reviewed-by: Derek Sollenberger <djsollen@google.com>
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Leon Scroggins <scroggo@google.com>1 parent d3c92d9 commit 85e22fc
3 files changed
+64
-9
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
25 | 25 | | |
26 | 26 | | |
27 | 27 | | |
| 28 | + | |
28 | 29 | | |
29 | 30 | | |
30 | 31 | | |
| |||
982 | 983 | | |
983 | 984 | | |
984 | 985 | | |
| 986 | + | |
| 987 | + | |
| 988 | + | |
| 989 | + | |
| 990 | + | |
| 991 | + | |
985 | 992 | | |
986 | 993 | | |
987 | 994 | | |
988 | | - | |
989 | 995 | | |
990 | 996 | | |
991 | 997 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
114 | 114 | | |
115 | 115 | | |
116 | 116 | | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
117 | 131 | | |
118 | 132 | | |
119 | 133 | | |
| |||
179 | 193 | | |
180 | 194 | | |
181 | 195 | | |
| 196 | + | |
| 197 | + | |
| 198 | + | |
| 199 | + | |
| 200 | + | |
182 | 201 | | |
183 | 202 | | |
184 | 203 | | |
| |||
268 | 287 | | |
269 | 288 | | |
270 | 289 | | |
| 290 | + | |
| 291 | + | |
| 292 | + | |
| 293 | + | |
| 294 | + | |
| 295 | + | |
| 296 | + | |
| 297 | + | |
| 298 | + | |
| 299 | + | |
| 300 | + | |
| 301 | + | |
| 302 | + | |
| 303 | + | |
| 304 | + | |
271 | 305 | | |
272 | 306 | | |
273 | 307 | | |
| |||
307 | 341 | | |
308 | 342 | | |
309 | 343 | | |
310 | | - | |
| 344 | + | |
| 345 | + | |
| 346 | + | |
| 347 | + | |
| 348 | + | |
| 349 | + | |
| 350 | + | |
311 | 351 | | |
312 | 352 | | |
| 353 | + | |
313 | 354 | | |
314 | 355 | | |
315 | 356 | | |
| |||
323 | 364 | | |
324 | 365 | | |
325 | 366 | | |
| 367 | + | |
326 | 368 | | |
327 | 369 | | |
328 | 370 | | |
329 | 371 | | |
330 | 372 | | |
331 | 373 | | |
| 374 | + | |
332 | 375 | | |
333 | 376 | | |
334 | 377 | | |
| |||
358 | 401 | | |
359 | 402 | | |
360 | 403 | | |
361 | | - | |
362 | | - | |
363 | | - | |
| 404 | + | |
| 405 | + | |
| 406 | + | |
364 | 407 | | |
365 | 408 | | |
366 | | - | |
367 | | - | |
| 409 | + | |
| 410 | + | |
368 | 411 | | |
369 | 412 | | |
370 | 413 | | |
371 | | - | |
372 | | - | |
| 414 | + | |
| 415 | + | |
| 416 | + | |
| 417 | + | |
| 418 | + | |
373 | 419 | | |
374 | 420 | | |
375 | 421 | | |
| |||
406 | 452 | | |
407 | 453 | | |
408 | 454 | | |
| 455 | + | |
409 | 456 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
62 | 62 | | |
63 | 63 | | |
64 | 64 | | |
| 65 | + | |
| 66 | + | |
65 | 67 | | |
66 | 68 | | |
67 | 69 | | |
| |||
0 commit comments