Make XML compilation conditional.

Make XML compilation conditional.

Only enabled for gyp-based builds at this time.

R=dogben@google.com,mtklein@google.com
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2150353002

Committed: https://skia.googlesource.com/skia/+/718df0ae3c9ea824eef3b80984550beb5ef2e1f2

[f(malita), 2016-07-15 14:27:45]

Description was changed from

==========
Make XML compilation conditional.

Only enabled for gyp-based builds at this time.

R=dogben@google.com,mtklein@google.com
==========

to

==========
Make XML compilation conditional.

Only enabled for gyp-based builds at this time.

R=dogben@google.com,mtklein@google.com
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2150353002
==========

[f(malita), 2016-07-15 14:28:32]

The CQ bit was checked by fmalita@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2016-07-15 14:28:38]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[mtklein, 2016-07-15 14:31:53]

lgtm

[dogben, 2016-07-15 14:41:41]

benjaminwagner@google.com changed reviewers:
+ benjaminwagner@google.com

[dogben, 2016-07-15 14:41:41]

https://codereview.chromium.org/2150353002/diff/1/tests/SkDOMTest.cpp
File tests/SkDOMTest.cpp (right):

https://codereview.chromium.org/2150353002/diff/1/tests/SkDOMTest.cpp#newcode11
tests/SkDOMTest.cpp:11: #if defined(SK_XML)
Does this need to be before the includes?

[f(malita), 2016-07-15 14:46:30]

https://codereview.chromium.org/2150353002/diff/1/tests/SkDOMTest.cpp
File tests/SkDOMTest.cpp (right):

https://codereview.chromium.org/2150353002/diff/1/tests/SkDOMTest.cpp#newcode11
tests/SkDOMTest.cpp:11: #if defined(SK_XML)
On 2016/07/15 14:41:41, Ben Wagner wrote:
> Does this need to be before the includes?

There's a presubmit check I tripped while trying to do that.  But SkDOM.h
doesn't seem to pull in any XML headers, so hopefully not required.

[commit-bot: I haz the power, 2016-07-15 14:52:28]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-07-15 14:52:29]

Dry run: This issue passed the CQ dry run.

[mtklein, 2016-07-15 16:20:32]

https://codereview.chromium.org/2150353002/diff/1/tests/SkDOMTest.cpp
File tests/SkDOMTest.cpp (right):

https://codereview.chromium.org/2150353002/diff/1/tests/SkDOMTest.cpp#newcode11
tests/SkDOMTest.cpp:11: #if defined(SK_XML)
On 2016/07/15 14:46:30, f(malita) wrote:
> On 2016/07/15 14:41:41, Ben Wagner wrote:
> > Does this need to be before the includes?
> 
> There's a presubmit check I tripped while trying to do that.  But SkDOM.h
> doesn't seem to pull in any XML headers, so hopefully not required.

The presubmit is there to guard against

#ifdef SK_BUILD_FOR_PLATFORM_DEFINED_IN_SKTYPES

#include "SkTypes.h"

#endif

If you want to quiet it down spiritually, you can

#include "SkTypes.h"

#if defined(SK_XML)

#include "SkDOM.h"
...

(That'd let SK_XML be defined in SkUserConfig.h, etc.)

[f(malita), 2016-07-15 16:47:55]

https://codereview.chromium.org/2150353002/diff/1/tests/SkDOMTest.cpp
File tests/SkDOMTest.cpp (right):

https://codereview.chromium.org/2150353002/diff/1/tests/SkDOMTest.cpp#newcode11
tests/SkDOMTest.cpp:11: #if defined(SK_XML)
On 2016/07/15 16:20:32, mtklein wrote:
> On 2016/07/15 14:46:30, f(malita) wrote:
> > On 2016/07/15 14:41:41, Ben Wagner wrote:
> > > Does this need to be before the includes?
> > 
> > There's a presubmit check I tripped while trying to do that.  But SkDOM.h
> > doesn't seem to pull in any XML headers, so hopefully not required.
> 
> The presubmit is there to guard against
> 
> #ifdef SK_BUILD_FOR_PLATFORM_DEFINED_IN_SKTYPES
> 
> #include "SkTypes.h"
> 
> #endif
> 
> If you want to quiet it down spiritually, you can
> 
> #include "SkTypes.h"
> 
> #if defined(SK_XML)
> 
> #include "SkDOM.h"
> ...
> 
> (That'd let SK_XML be defined in SkUserConfig.h, etc.)

Done.

[f(malita), 2016-07-15 16:48:01]

The CQ bit was checked by fmalita@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2016-07-15 16:48:07]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-07-15 17:04:40]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-07-15 17:04:41]

Dry run: Try jobs failed on following builders:
  Build-Win-MSVC-x86_64-Debug-Trybot on master.client.skia.compile (JOB_FAILED,
http://build.chromium.org/p/client.skia.compile/builders/Build-Win-MSVC-x86_6...)

[borenet, 2016-07-15 17:16:57]

The CQ bit was checked by borenet@google.com

[borenet, 2016-07-15 17:16:58]

The patchset sent to the CQ was uploaded after l-g-t-m from mtklein@google.com
Link to the patchset: https://codereview.chromium.org/2150353002/#ps20001
(title: "improved SkDOMTest guard")

[commit-bot: I haz the power, 2016-07-15 17:17:00]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-07-15 17:33:31]

Description was changed from

==========
Make XML compilation conditional.

Only enabled for gyp-based builds at this time.

R=dogben@google.com,mtklein@google.com
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2150353002
==========

to

==========
Make XML compilation conditional.

Only enabled for gyp-based builds at this time.

R=dogben@google.com,mtklein@google.com
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2150353002

Committed:
https://skia.googlesource.com/skia/+/718df0ae3c9ea824eef3b80984550beb5ef2e1f2
==========

[commit-bot: I haz the power, 2016-07-15 17:33:32]

Committed patchset #2 (id:20001) as
https://skia.googlesource.com/skia/+/718df0ae3c9ea824eef3b80984550beb5ef2e1f2