Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(27)

Issue 1291603003: Add files from google3 to Git repo. (Closed)

Created:
5 years, 4 months ago by dogben
Modified:
5 years, 4 months ago
CC:
reviews_skia.org, hcm, caryclark
Base URL:
https://skia.googlesource.com/skia@master
Target Ref:
refs/heads/master
Project:
skia
Visibility:
Public.

Description

Add files added to Skia HEAD in google3 to the Git repo. LICENSE is modified in google3 to mention some code copied from other projects. BUG=skia: Committed: https://skia.googlesource.com/skia/+/787ca87b338a5fcd0612b70815cc7d5438c42983

Patch Set 1 #

Patch Set 2 : #

Patch Set 3 : Rebase. #

Patch Set 4 : Revert files that break CQ, remove unnecessary section in LICENSE. #

Patch Set 5 : Remove BUILD, add BUILD.public, and update sync script to replace BUILD.google with BUILD. #

Total comments: 2
Unified diffs Side-by-side diffs Delta from patch set Stats (+519 lines, -0 lines) Patch
A BUILD.public View 1 2 3 4 1 chunk +129 lines, -0 lines 2 comments Download
M LICENSE View 1 2 3 1 chunk +206 lines, -0 lines 0 comments Download
A tools/create_skia_google3_client.sh View 1 1 chunk +24 lines, -0 lines 0 comments Download
A tools/get_skia_lkgr.sh View 1 1 chunk +23 lines, -0 lines 0 comments Download
A tools/git_clone_to_google3.sh View 1 2 3 4 1 chunk +94 lines, -0 lines 0 comments Download
A tools/sync_google3.sh View 1 1 chunk +43 lines, -0 lines 0 comments Download

Messages

Total messages: 35 (14 generated)
dogben
5 years, 4 months ago (2015-08-13 17:28:26 UTC) #2
mtklein
On 2015/08/13 17:28:26, Ben Wagner wrote: Hmm, I may have missed this before, but we ...
5 years, 4 months ago (2015-08-13 17:40:58 UTC) #3
mtklein
+Mike, in case he's got an opinion on LICENSE.
5 years, 4 months ago (2015-08-13 17:41:27 UTC) #5
dogben
PTAL
5 years, 4 months ago (2015-08-17 13:35:16 UTC) #8
mtklein
lgtm Adding Cary and Heather as FYI.
5 years, 4 months ago (2015-08-17 15:37:11 UTC) #9
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1291603003/60001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1291603003/60001
5 years, 4 months ago (2015-08-17 15:46:03 UTC) #11
commit-bot: I haz the power
Try jobs failed on following builders: Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared-Trybot on client.skia (JOB_FAILED, http://build.chromium.org/p/client.skia/builders/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared-Trybot/builds/2629) Build-Ubuntu-GCC-Arm64-Debug-Android-Trybot on client.skia.compile (JOB_FAILED, ...
5 years, 4 months ago (2015-08-17 15:46:44 UTC) #13
mtklein
On 2015/08/17 15:46:44, commit-bot: I haz the power wrote: > Try jobs failed on following ...
5 years, 4 months ago (2015-08-17 15:50:55 UTC) #14
commit-bot: I haz the power
Dry run: CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1291603003/80001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1291603003/80001
5 years, 4 months ago (2015-08-17 16:32:15 UTC) #16
commit-bot: I haz the power
Dry run: Try jobs failed on following builders: skia_presubmit-Trybot on client.skia.fyi (JOB_FAILED, http://build.chromium.org/p/client.skia.fyi/builders/skia_presubmit-Trybot/builds/1913)
5 years, 4 months ago (2015-08-17 16:32:56 UTC) #18
mtklein_C
If all goes well now at head, the changes to LICENSE should not be necessary. ...
5 years, 4 months ago (2015-08-17 17:21:40 UTC) #20
mtklein
On 2015/08/17 17:21:40, mtklein_C wrote: > If all goes well now at head, the changes ...
5 years, 4 months ago (2015-08-17 18:25:47 UTC) #21
commit-bot: I haz the power
Dry run: CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1291603003/100001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1291603003/100001
5 years, 4 months ago (2015-08-17 18:33:38 UTC) #23
commit-bot: I haz the power
Dry run: This issue passed the CQ dry run.
5 years, 4 months ago (2015-08-17 18:40:33 UTC) #25
dogben
On 2015/08/17 18:25:47, mtklein wrote: > On 2015/08/17 17:21:40, mtklein_C wrote: > > If all ...
5 years, 4 months ago (2015-08-17 18:48:23 UTC) #26
mtklein_C
On 2015/08/17 18:48:23, Ben Wagner wrote: > On 2015/08/17 18:25:47, mtklein wrote: > > On ...
5 years, 4 months ago (2015-08-17 19:43:38 UTC) #27
dogben
On 2015/08/17 19:43:38, mtklein_C wrote: > On 2015/08/17 18:48:23, Ben Wagner wrote: > > On ...
5 years, 4 months ago (2015-08-17 19:51:01 UTC) #28
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1291603003/120001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1291603003/120001
5 years, 4 months ago (2015-08-17 19:52:13 UTC) #31
commit-bot: I haz the power
Committed patchset #5 (id:120001) as https://skia.googlesource.com/skia/+/787ca87b338a5fcd0612b70815cc7d5438c42983
5 years, 4 months ago (2015-08-17 19:58:13 UTC) #32
hal.canary
https://codereview.chromium.org/1291603003/diff/120001/BUILD.public File BUILD.public (right): https://codereview.chromium.org/1291603003/diff/120001/BUILD.public#newcode65 BUILD.public:65: "src/doc/*_XPS.cpp", exclude src/doc/SkDocument_PDF_None.cpp ?
5 years, 4 months ago (2015-08-17 21:45:47 UTC) #34
mtklein
5 years, 4 months ago (2015-08-17 21:52:54 UTC) #35
Message was sent while issue was closed.
https://codereview.chromium.org/1291603003/diff/120001/BUILD.public
File BUILD.public (right):

https://codereview.chromium.org/1291603003/diff/120001/BUILD.public#newcode65
BUILD.public:65: "src/doc/*_XPS.cpp",
On 2015/08/17 21:45:47, Hal Canary wrote:
> exclude src/doc/SkDocument_PDF_None.cpp ?

Yes, this will need to be done before we roll to head or we'll end up with
duplicate symbol definitions when linking.

Powered by Google App Engine
This is Rietveld 408576698