Skip to content

Commit

Permalink
Prevent GN from choking on conditional imports. (flutter#3805)
Browse files Browse the repository at this point in the history
  • Loading branch information
pylaligand authored Jun 21, 2017
1 parent 76397e9 commit f61869e
Show file tree
Hide file tree
Showing 8 changed files with 18 additions and 18 deletions.
4 changes: 2 additions & 2 deletions flow/layers/clip_path_layer.cc
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
#include "flutter/flow/layers/clip_path_layer.h"

#if defined(OS_FUCHSIA)
#include "apps/mozart/lib/skia/type_converters.h"
#include "apps/mozart/services/composition/nodes.fidl.h"
#include "apps/mozart/lib/skia/type_converters.h" // nogncheck
#include "apps/mozart/services/composition/nodes.fidl.h" // nogncheck
#endif // defined(OS_FUCHSIA)

namespace flow {
Expand Down
4 changes: 2 additions & 2 deletions flow/layers/clip_rect_layer.cc
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
#include "flutter/flow/layers/clip_rect_layer.h"

#if defined(OS_FUCHSIA)
#include "apps/mozart/lib/skia/type_converters.h"
#include "apps/mozart/services/composition/nodes.fidl.h"
#include "apps/mozart/lib/skia/type_converters.h" // nogncheck
#include "apps/mozart/services/composition/nodes.fidl.h" // nogncheck
#endif // defined(OS_FUCHSIA)

namespace flow {
Expand Down
4 changes: 2 additions & 2 deletions flow/layers/clip_rrect_layer.cc
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
#include "flutter/flow/layers/clip_rrect_layer.h"

#if defined(OS_FUCHSIA)
#include "apps/mozart/lib/skia/type_converters.h"
#include "apps/mozart/services/composition/nodes.fidl.h"
#include "apps/mozart/lib/skia/type_converters.h" // nogncheck
#include "apps/mozart/services/composition/nodes.fidl.h" // nogncheck
#endif // defined(OS_FUCHSIA)

namespace flow {
Expand Down
4 changes: 2 additions & 2 deletions flow/layers/opacity_layer.cc
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
#include "flutter/flow/layers/opacity_layer.h"

#if defined(OS_FUCHSIA)
#include "apps/mozart/lib/skia/type_converters.h"
#include "apps/mozart/services/composition/nodes.fidl.h"
#include "apps/mozart/lib/skia/type_converters.h" // nogncheck
#include "apps/mozart/services/composition/nodes.fidl.h" // nogncheck
#endif // defined(OS_FUCHSIA)

namespace flow {
Expand Down
4 changes: 2 additions & 2 deletions flow/layers/physical_model_layer.cc
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
#include "third_party/skia/include/utils/SkShadowUtils.h"

#if defined(OS_FUCHSIA)
#include "apps/mozart/lib/skia/type_converters.h"
#include "apps/mozart/services/composition/nodes.fidl.h"
#include "apps/mozart/lib/skia/type_converters.h" // nogncheck
#include "apps/mozart/services/composition/nodes.fidl.h" // nogncheck
#endif // defined(OS_FUCHSIA)

namespace flow {
Expand Down
4 changes: 2 additions & 2 deletions flow/layers/transform_layer.cc
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
#include "flutter/flow/layers/transform_layer.h"

#if defined(OS_FUCHSIA)
#include "apps/mozart/lib/skia/type_converters.h"
#include "apps/mozart/services/composition/nodes.fidl.h"
#include "apps/mozart/lib/skia/type_converters.h" // nogncheck
#include "apps/mozart/services/composition/nodes.fidl.h" // nogncheck
#endif // defined(OS_FUCHSIA)

namespace flow {
Expand Down
6 changes: 3 additions & 3 deletions flow/scene_update_context.cc
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@

#if defined(OS_FUCHSIA)

#include "apps/mozart/lib/skia/skia_vmo_surface.h"
#include "apps/mozart/lib/skia/type_converters.h"
#include "apps/mozart/services/composition/scenes.fidl.h"
#include "apps/mozart/lib/skia/skia_vmo_surface.h" // nogncheck
#include "apps/mozart/lib/skia/type_converters.h" // nogncheck
#include "apps/mozart/services/composition/scenes.fidl.h" // nogncheck
#include "flutter/flow/layers/layer.h"
#include "flutter/glue/trace_event.h"

Expand Down
6 changes: 3 additions & 3 deletions flow/scene_update_context.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
#include "third_party/skia/include/core/SkSurface.h"

#if defined(OS_FUCHSIA)
#include "apps/mozart/services/composition/nodes.fidl.h"
#include "apps/mozart/services/composition/resources.fidl.h"
#include "apps/mozart/services/images/image.fidl.h"
#include "apps/mozart/services/composition/nodes.fidl.h" // nogncheck
#include "apps/mozart/services/composition/resources.fidl.h" // nogncheck
#include "apps/mozart/services/images/image.fidl.h" // nogncheck
#endif // defined(OS_FUCHSIA)

namespace mozart {
Expand Down

0 comments on commit f61869e

Please sign in to comment.