Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 24e249a

Browse files
chinmaygardednfield
chinmaygarde
authored and
dnfield
committed
Fix top-level build group to not include the compiler and fixup headers. (#66)
Targets in the engine had to individually depend on each sub-target in Impeller when all they cared about was all the client libs. The compiler is a build time implicit dependency. So that has been removed from the top-level group. Also fixed all the headers so that TUs within Impeller don't care about where Impeller itself sits in the source tree.
1 parent e5fc548 commit 24e249a

16 files changed

+40
-49
lines changed

‎impeller/BUILD.gn

+1-10
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,9 @@
33
# found in the LICENSE file.
44

55
config("impeller_public_config") {
6-
include_dirs = [
7-
"..",
8-
".",
9-
]
6+
include_dirs = [ ".." ]
107
}
118

12-
is_host = is_mac || is_linux || is_win
13-
149
group("impeller") {
1510
public_deps = [
1611
"aiks",
@@ -24,10 +19,6 @@ group("impeller") {
2419
"tessellator",
2520
"typographer",
2621
]
27-
28-
if (is_host) {
29-
public_deps += [ "compiler" ]
30-
}
3122
}
3223

3324
executable("impeller_unittests") {

‎impeller/aiks/image.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
#include "flutter/impeller/aiks/image.h"
5+
#include "impeller/aiks/image.h"
66

77
namespace impeller {
88

‎impeller/aiks/picture_recorder.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
#include "flutter/impeller/aiks/picture_recorder.h"
5+
#include "impeller/aiks/picture_recorder.h"
66

7-
#include "flutter/impeller/aiks/canvas.h"
7+
#include "impeller/aiks/canvas.h"
88

99
namespace impeller {
1010

‎impeller/base/validation.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
#include "flutter/impeller/base/validation.h"
5+
#include "impeller/base/validation.h"
66

77
#include "flutter/fml/logging.h"
88

‎impeller/compiler/compiler.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
#include "flutter/impeller/compiler/compiler.h"
5+
#include "impeller/compiler/compiler.h"
66

77
#include <filesystem>
88
#include <memory>
99
#include <sstream>
1010

1111
#include "flutter/fml/paths.h"
12-
#include "flutter/impeller/compiler/logger.h"
12+
#include "impeller/compiler/logger.h"
1313

1414
namespace impeller {
1515
namespace compiler {

‎impeller/compiler/compiler.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010

1111
#include "flutter/fml/macros.h"
1212
#include "flutter/fml/mapping.h"
13-
#include "flutter/impeller/compiler/include_dir.h"
14-
#include "flutter/impeller/compiler/reflector.h"
13+
#include "impeller/compiler/include_dir.h"
14+
#include "impeller/compiler/reflector.h"
1515
#include "shaderc/shaderc.hpp"
1616
#include "third_party/spirv_cross/spirv_msl.hpp"
1717
#include "third_party/spirv_cross/spirv_parser.hpp"

‎impeller/compiler/compiler_unittests.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
#include "flutter/impeller/compiler/compiler.h"
65
#include "flutter/testing/testing.h"
76
#include "gtest/gtest.h"
87
#include "impeller/base/validation.h"
8+
#include "impeller/compiler/compiler.h"
99

1010
namespace impeller {
1111
namespace compiler {

‎impeller/compiler/impellerc_main.cc

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
#include "flutter/fml/file.h"
99
#include "flutter/fml/macros.h"
1010
#include "flutter/fml/mapping.h"
11-
#include "flutter/impeller/compiler/compiler.h"
12-
#include "flutter/impeller/compiler/switches.h"
13-
#include "flutter/impeller/compiler/utilities.h"
11+
#include "impeller/compiler/compiler.h"
12+
#include "impeller/compiler/switches.h"
13+
#include "impeller/compiler/utilities.h"
1414
#include "third_party/shaderc/libshaderc/include/shaderc/shaderc.hpp"
1515

1616
namespace impeller {

‎impeller/compiler/reflector.cc

+5-5
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
#include "flutter/impeller/compiler/reflector.h"
5+
#include "impeller/compiler/reflector.h"
66

77
#include <atomic>
88
#include <optional>
@@ -11,12 +11,12 @@
1111

1212
#include "flutter/fml/closure.h"
1313
#include "flutter/fml/logging.h"
14-
#include "flutter/impeller/compiler/code_gen_template.h"
15-
#include "flutter/impeller/compiler/utilities.h"
16-
#include "flutter/impeller/geometry/matrix.h"
17-
#include "flutter/impeller/geometry/scalar.h"
1814
#include "impeller/base/strings.h"
1915
#include "impeller/base/validation.h"
16+
#include "impeller/compiler/code_gen_template.h"
17+
#include "impeller/compiler/utilities.h"
18+
#include "impeller/geometry/matrix.h"
19+
#include "impeller/geometry/scalar.h"
2020

2121
namespace impeller {
2222
namespace compiler {

‎impeller/compiler/switches.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
#include "flutter/impeller/compiler/switches.h"
5+
#include "impeller/compiler/switches.h"
66

77
#include <filesystem>
88
#include <map>

‎impeller/compiler/switches.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
#include "flutter/fml/command_line.h"
1111
#include "flutter/fml/macros.h"
1212
#include "flutter/fml/unique_fd.h"
13-
#include "flutter/impeller/compiler/compiler.h"
14-
#include "flutter/impeller/compiler/include_dir.h"
13+
#include "impeller/compiler/compiler.h"
14+
#include "impeller/compiler/include_dir.h"
1515

1616
namespace impeller {
1717
namespace compiler {

‎impeller/compiler/utilities.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
#include "flutter/impeller/compiler/utilities.h"
5+
#include "impeller/compiler/utilities.h"
66

77
#include <filesystem>
88
#include <sstream>

‎impeller/entity/contents/clip_contents.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
#include "flutter/fml/macros.h"
1212
#include "impeller/entity/contents/contents.h"
13-
#include "typographer/glyph_atlas.h"
13+
#include "impeller/typographer/glyph_atlas.h"
1414

1515
namespace impeller {
1616

‎impeller/entity/contents/content_context.h

+10-10
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@
99

1010
#include "flutter/fml/hash_combine.h"
1111
#include "flutter/fml/macros.h"
12-
#include "flutter/impeller/entity/glyph_atlas.frag.h"
13-
#include "flutter/impeller/entity/glyph_atlas.vert.h"
14-
#include "flutter/impeller/entity/gradient_fill.frag.h"
15-
#include "flutter/impeller/entity/gradient_fill.vert.h"
16-
#include "flutter/impeller/entity/solid_fill.frag.h"
17-
#include "flutter/impeller/entity/solid_fill.vert.h"
18-
#include "flutter/impeller/entity/solid_stroke.frag.h"
19-
#include "flutter/impeller/entity/solid_stroke.vert.h"
20-
#include "flutter/impeller/entity/texture_fill.frag.h"
21-
#include "flutter/impeller/entity/texture_fill.vert.h"
2212
#include "impeller/entity/entity.h"
13+
#include "impeller/entity/glyph_atlas.frag.h"
14+
#include "impeller/entity/glyph_atlas.vert.h"
15+
#include "impeller/entity/gradient_fill.frag.h"
16+
#include "impeller/entity/gradient_fill.vert.h"
17+
#include "impeller/entity/solid_fill.frag.h"
18+
#include "impeller/entity/solid_fill.vert.h"
19+
#include "impeller/entity/solid_stroke.frag.h"
20+
#include "impeller/entity/solid_stroke.vert.h"
21+
#include "impeller/entity/texture_fill.frag.h"
22+
#include "impeller/entity/texture_fill.vert.h"
2323
#include "impeller/renderer/formats.h"
2424

2525
namespace impeller {

‎impeller/playground/playground.mm

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
#include <sstream>
66

77
#include "flutter/fml/paths.h"
8-
#include "flutter/impeller/entity/entity_shaders.h"
9-
#include "flutter/impeller/fixtures/shader_fixtures.h"
108
#include "flutter/testing/testing.h"
119
#include "impeller/base/validation.h"
10+
#include "impeller/entity/entity_shaders.h"
11+
#include "impeller/fixtures/shader_fixtures.h"
1212
#include "impeller/image/compressed_image.h"
1313
#include "impeller/playground/imgui/imgui_impl_impeller.h"
1414
#include "impeller/playground/imgui/imgui_shaders.h"

‎impeller/renderer/renderer_unittests.cc

+5-5
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
// found in the LICENSE file.
44

55
#include "flutter/fml/time/time_point.h"
6-
#include "flutter/impeller/fixtures/box_fade.frag.h"
7-
#include "flutter/impeller/fixtures/box_fade.vert.h"
8-
#include "flutter/impeller/fixtures/test_texture.frag.h"
9-
#include "flutter/impeller/fixtures/test_texture.vert.h"
106
#include "flutter/testing/testing.h"
7+
#include "impeller/fixtures/box_fade.frag.h"
8+
#include "impeller/fixtures/box_fade.vert.h"
9+
#include "impeller/fixtures/test_texture.frag.h"
10+
#include "impeller/fixtures/test_texture.vert.h"
1111
#include "impeller/geometry/path_builder.h"
1212
#include "impeller/image/compressed_image.h"
1313
#include "impeller/image/decompressed_image.h"
@@ -21,8 +21,8 @@
2121
#include "impeller/renderer/sampler_descriptor.h"
2222
#include "impeller/renderer/sampler_library.h"
2323
#include "impeller/renderer/surface.h"
24-
#include "impeller/tessellator/tessellator.h"
2524
#include "impeller/renderer/vertex_buffer_builder.h"
25+
#include "impeller/tessellator/tessellator.h"
2626

2727
namespace impeller {
2828
namespace testing {

0 commit comments

Comments
 (0)