diff --git a/engine/src/flutter/impeller/BUILD.gn b/engine/src/flutter/impeller/BUILD.gn index aa258109d90..ff9e7be985f 100644 --- a/engine/src/flutter/impeller/BUILD.gn +++ b/engine/src/flutter/impeller/BUILD.gn @@ -3,14 +3,9 @@ # found in the LICENSE file. config("impeller_public_config") { - include_dirs = [ - "..", - ".", - ] + include_dirs = [ ".." ] } -is_host = is_mac || is_linux || is_win - group("impeller") { public_deps = [ "aiks", @@ -24,10 +19,6 @@ group("impeller") { "tessellator", "typographer", ] - - if (is_host) { - public_deps += [ "compiler" ] - } } executable("impeller_unittests") { diff --git a/engine/src/flutter/impeller/aiks/image.cc b/engine/src/flutter/impeller/aiks/image.cc index 9e0c8fdf8fe..342c4eee6a4 100644 --- a/engine/src/flutter/impeller/aiks/image.cc +++ b/engine/src/flutter/impeller/aiks/image.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "flutter/impeller/aiks/image.h" +#include "impeller/aiks/image.h" namespace impeller { diff --git a/engine/src/flutter/impeller/aiks/picture_recorder.cc b/engine/src/flutter/impeller/aiks/picture_recorder.cc index c4040ca19e5..0d458468989 100644 --- a/engine/src/flutter/impeller/aiks/picture_recorder.cc +++ b/engine/src/flutter/impeller/aiks/picture_recorder.cc @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "flutter/impeller/aiks/picture_recorder.h" +#include "impeller/aiks/picture_recorder.h" -#include "flutter/impeller/aiks/canvas.h" +#include "impeller/aiks/canvas.h" namespace impeller { diff --git a/engine/src/flutter/impeller/base/validation.cc b/engine/src/flutter/impeller/base/validation.cc index d0b113aee12..1394cbc4218 100644 --- a/engine/src/flutter/impeller/base/validation.cc +++ b/engine/src/flutter/impeller/base/validation.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "flutter/impeller/base/validation.h" +#include "impeller/base/validation.h" #include "flutter/fml/logging.h" diff --git a/engine/src/flutter/impeller/compiler/compiler.cc b/engine/src/flutter/impeller/compiler/compiler.cc index f427aeba7b9..b6ac4b614d0 100644 --- a/engine/src/flutter/impeller/compiler/compiler.cc +++ b/engine/src/flutter/impeller/compiler/compiler.cc @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "flutter/impeller/compiler/compiler.h" +#include "impeller/compiler/compiler.h" #include #include #include #include "flutter/fml/paths.h" -#include "flutter/impeller/compiler/logger.h" +#include "impeller/compiler/logger.h" namespace impeller { namespace compiler { diff --git a/engine/src/flutter/impeller/compiler/compiler.h b/engine/src/flutter/impeller/compiler/compiler.h index 689ec08183b..9310bdc9bcf 100644 --- a/engine/src/flutter/impeller/compiler/compiler.h +++ b/engine/src/flutter/impeller/compiler/compiler.h @@ -10,8 +10,8 @@ #include "flutter/fml/macros.h" #include "flutter/fml/mapping.h" -#include "flutter/impeller/compiler/include_dir.h" -#include "flutter/impeller/compiler/reflector.h" +#include "impeller/compiler/include_dir.h" +#include "impeller/compiler/reflector.h" #include "shaderc/shaderc.hpp" #include "third_party/spirv_cross/spirv_msl.hpp" #include "third_party/spirv_cross/spirv_parser.hpp" diff --git a/engine/src/flutter/impeller/compiler/compiler_unittests.cc b/engine/src/flutter/impeller/compiler/compiler_unittests.cc index f681d34281d..eca45618877 100644 --- a/engine/src/flutter/impeller/compiler/compiler_unittests.cc +++ b/engine/src/flutter/impeller/compiler/compiler_unittests.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "flutter/impeller/compiler/compiler.h" #include "flutter/testing/testing.h" #include "gtest/gtest.h" #include "impeller/base/validation.h" +#include "impeller/compiler/compiler.h" namespace impeller { namespace compiler { diff --git a/engine/src/flutter/impeller/compiler/impellerc_main.cc b/engine/src/flutter/impeller/compiler/impellerc_main.cc index de9f762238e..8dd49a9a259 100644 --- a/engine/src/flutter/impeller/compiler/impellerc_main.cc +++ b/engine/src/flutter/impeller/compiler/impellerc_main.cc @@ -8,9 +8,9 @@ #include "flutter/fml/file.h" #include "flutter/fml/macros.h" #include "flutter/fml/mapping.h" -#include "flutter/impeller/compiler/compiler.h" -#include "flutter/impeller/compiler/switches.h" -#include "flutter/impeller/compiler/utilities.h" +#include "impeller/compiler/compiler.h" +#include "impeller/compiler/switches.h" +#include "impeller/compiler/utilities.h" #include "third_party/shaderc/libshaderc/include/shaderc/shaderc.hpp" namespace impeller { diff --git a/engine/src/flutter/impeller/compiler/reflector.cc b/engine/src/flutter/impeller/compiler/reflector.cc index b7f3f190e46..b0f91d70e39 100644 --- a/engine/src/flutter/impeller/compiler/reflector.cc +++ b/engine/src/flutter/impeller/compiler/reflector.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "flutter/impeller/compiler/reflector.h" +#include "impeller/compiler/reflector.h" #include #include @@ -11,12 +11,12 @@ #include "flutter/fml/closure.h" #include "flutter/fml/logging.h" -#include "flutter/impeller/compiler/code_gen_template.h" -#include "flutter/impeller/compiler/utilities.h" -#include "flutter/impeller/geometry/matrix.h" -#include "flutter/impeller/geometry/scalar.h" #include "impeller/base/strings.h" #include "impeller/base/validation.h" +#include "impeller/compiler/code_gen_template.h" +#include "impeller/compiler/utilities.h" +#include "impeller/geometry/matrix.h" +#include "impeller/geometry/scalar.h" namespace impeller { namespace compiler { diff --git a/engine/src/flutter/impeller/compiler/switches.cc b/engine/src/flutter/impeller/compiler/switches.cc index 30f20a3006f..5ab2bf7453c 100644 --- a/engine/src/flutter/impeller/compiler/switches.cc +++ b/engine/src/flutter/impeller/compiler/switches.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "flutter/impeller/compiler/switches.h" +#include "impeller/compiler/switches.h" #include #include diff --git a/engine/src/flutter/impeller/compiler/switches.h b/engine/src/flutter/impeller/compiler/switches.h index 2380ca21521..3b7fac89d2e 100644 --- a/engine/src/flutter/impeller/compiler/switches.h +++ b/engine/src/flutter/impeller/compiler/switches.h @@ -10,8 +10,8 @@ #include "flutter/fml/command_line.h" #include "flutter/fml/macros.h" #include "flutter/fml/unique_fd.h" -#include "flutter/impeller/compiler/compiler.h" -#include "flutter/impeller/compiler/include_dir.h" +#include "impeller/compiler/compiler.h" +#include "impeller/compiler/include_dir.h" namespace impeller { namespace compiler { diff --git a/engine/src/flutter/impeller/compiler/utilities.cc b/engine/src/flutter/impeller/compiler/utilities.cc index 3ba9ef533dd..78fa5df5e47 100644 --- a/engine/src/flutter/impeller/compiler/utilities.cc +++ b/engine/src/flutter/impeller/compiler/utilities.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "flutter/impeller/compiler/utilities.h" +#include "impeller/compiler/utilities.h" #include #include diff --git a/engine/src/flutter/impeller/entity/contents/clip_contents.h b/engine/src/flutter/impeller/entity/contents/clip_contents.h index 41fe7cf4a53..1481873ae73 100644 --- a/engine/src/flutter/impeller/entity/contents/clip_contents.h +++ b/engine/src/flutter/impeller/entity/contents/clip_contents.h @@ -10,7 +10,7 @@ #include "flutter/fml/macros.h" #include "impeller/entity/contents/contents.h" -#include "typographer/glyph_atlas.h" +#include "impeller/typographer/glyph_atlas.h" namespace impeller { diff --git a/engine/src/flutter/impeller/entity/contents/content_context.h b/engine/src/flutter/impeller/entity/contents/content_context.h index 0a3db38541c..45580647faa 100644 --- a/engine/src/flutter/impeller/entity/contents/content_context.h +++ b/engine/src/flutter/impeller/entity/contents/content_context.h @@ -9,17 +9,17 @@ #include "flutter/fml/hash_combine.h" #include "flutter/fml/macros.h" -#include "flutter/impeller/entity/glyph_atlas.frag.h" -#include "flutter/impeller/entity/glyph_atlas.vert.h" -#include "flutter/impeller/entity/gradient_fill.frag.h" -#include "flutter/impeller/entity/gradient_fill.vert.h" -#include "flutter/impeller/entity/solid_fill.frag.h" -#include "flutter/impeller/entity/solid_fill.vert.h" -#include "flutter/impeller/entity/solid_stroke.frag.h" -#include "flutter/impeller/entity/solid_stroke.vert.h" -#include "flutter/impeller/entity/texture_fill.frag.h" -#include "flutter/impeller/entity/texture_fill.vert.h" #include "impeller/entity/entity.h" +#include "impeller/entity/glyph_atlas.frag.h" +#include "impeller/entity/glyph_atlas.vert.h" +#include "impeller/entity/gradient_fill.frag.h" +#include "impeller/entity/gradient_fill.vert.h" +#include "impeller/entity/solid_fill.frag.h" +#include "impeller/entity/solid_fill.vert.h" +#include "impeller/entity/solid_stroke.frag.h" +#include "impeller/entity/solid_stroke.vert.h" +#include "impeller/entity/texture_fill.frag.h" +#include "impeller/entity/texture_fill.vert.h" #include "impeller/renderer/formats.h" namespace impeller { diff --git a/engine/src/flutter/impeller/playground/playground.mm b/engine/src/flutter/impeller/playground/playground.mm index be65b582ad6..9b13acc5e66 100644 --- a/engine/src/flutter/impeller/playground/playground.mm +++ b/engine/src/flutter/impeller/playground/playground.mm @@ -5,10 +5,10 @@ #include #include "flutter/fml/paths.h" -#include "flutter/impeller/entity/entity_shaders.h" -#include "flutter/impeller/fixtures/shader_fixtures.h" #include "flutter/testing/testing.h" #include "impeller/base/validation.h" +#include "impeller/entity/entity_shaders.h" +#include "impeller/fixtures/shader_fixtures.h" #include "impeller/image/compressed_image.h" #include "impeller/playground/imgui/imgui_impl_impeller.h" #include "impeller/playground/imgui/imgui_shaders.h" diff --git a/engine/src/flutter/impeller/renderer/renderer_unittests.cc b/engine/src/flutter/impeller/renderer/renderer_unittests.cc index 01cc768328f..d4a34824163 100644 --- a/engine/src/flutter/impeller/renderer/renderer_unittests.cc +++ b/engine/src/flutter/impeller/renderer/renderer_unittests.cc @@ -3,11 +3,11 @@ // found in the LICENSE file. #include "flutter/fml/time/time_point.h" -#include "flutter/impeller/fixtures/box_fade.frag.h" -#include "flutter/impeller/fixtures/box_fade.vert.h" -#include "flutter/impeller/fixtures/test_texture.frag.h" -#include "flutter/impeller/fixtures/test_texture.vert.h" #include "flutter/testing/testing.h" +#include "impeller/fixtures/box_fade.frag.h" +#include "impeller/fixtures/box_fade.vert.h" +#include "impeller/fixtures/test_texture.frag.h" +#include "impeller/fixtures/test_texture.vert.h" #include "impeller/geometry/path_builder.h" #include "impeller/image/compressed_image.h" #include "impeller/image/decompressed_image.h" @@ -21,8 +21,8 @@ #include "impeller/renderer/sampler_descriptor.h" #include "impeller/renderer/sampler_library.h" #include "impeller/renderer/surface.h" -#include "impeller/tessellator/tessellator.h" #include "impeller/renderer/vertex_buffer_builder.h" +#include "impeller/tessellator/tessellator.h" namespace impeller { namespace testing {