Skip to content

Commit 6734ab3

Browse files
pgurujipguruji
authored
Fix include paths to help building flutter runner for Fuchsia in Google3. (flutter#18840)
Include header file without absolute path if the header file belongs to the same directory as source file.
1 parent c0365be commit 6734ab3

37 files changed

+77
-78
lines changed

‎flow/layers/child_scene_layer.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
#ifndef FLUTTER_FLOW_LAYERS_CHILD_SCENE_LAYER_H_
66
#define FLUTTER_FLOW_LAYERS_CHILD_SCENE_LAYER_H_
77

8-
#include <third_party/skia/include/core/SkMatrix.h>
9-
#include <third_party/skia/include/core/SkPoint.h>
10-
#include <third_party/skia/include/core/SkSize.h>
8+
#include "third_party/skia/include/core/SkMatrix.h"
9+
#include "third_party/skia/include/core/SkPoint.h"
10+
#include "third_party/skia/include/core/SkSize.h"
1111

1212
#include "flutter/flow/layers/layer.h"
1313
#include "flutter/flow/scene_update_context.h"

‎flow/view_holder.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
#include <fuchsia/ui/views/cpp/fidl.h>
1010
#include <lib/ui/scenic/cpp/id.h>
1111
#include <lib/ui/scenic/cpp/resources.h>
12-
#include <third_party/skia/include/core/SkMatrix.h>
13-
#include <third_party/skia/include/core/SkPoint.h>
14-
#include <third_party/skia/include/core/SkSize.h>
1512
#include <zircon/types.h>
13+
#include "third_party/skia/include/core/SkMatrix.h"
14+
#include "third_party/skia/include/core/SkPoint.h"
15+
#include "third_party/skia/include/core/SkSize.h"
1616

1717
#include <memory>
1818

‎shell/platform/fuchsia/runtime/dart/utils/files.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
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 "runtime/dart/utils/files.h"
5+
#include "files.h"
66

77
#include <fcntl.h>
88
#include <stdint.h>
99

10-
#include "runtime/dart/utils/inlines.h"
11-
#include "runtime/dart/utils/logging.h"
10+
#include "inlines.h"
11+
#include "logging.h"
1212

1313
namespace dart_utils {
1414

‎shell/platform/fuchsia/runtime/dart/utils/handle_exception.cc

Lines changed: 2 additions & 2 deletions
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 "runtime/dart/utils/handle_exception.h"
5+
#include "handle_exception.h"
66

77
#include <fuchsia/feedback/cpp/fidl.h>
88
#include <fuchsia/mem/cpp/fidl.h>
@@ -14,7 +14,7 @@
1414

1515
#include <string>
1616

17-
#include "runtime/dart/utils/logging.h"
17+
#include "logging.h"
1818

1919
namespace {
2020
static bool SetStackTrace(const std::string& data,

‎shell/platform/fuchsia/runtime/dart/utils/mapped_resource.cc

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,10 @@
1818
#include <zircon/dlfcn.h>
1919
#include <zircon/status.h>
2020

21+
#include "inlines.h"
2122
#include "logging.h"
22-
#include "runtime/dart/utils/inlines.h"
23-
#include "runtime/dart/utils/logging.h"
24-
#include "runtime/dart/utils/vmo.h"
2523
#include "third_party/dart/runtime/include/dart_api.h"
24+
#include "vmo.h"
2625

2726
namespace dart_utils {
2827

‎shell/platform/fuchsia/runtime/dart/utils/tempfs.cc

Lines changed: 2 additions & 2 deletions
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 "runtime/dart/utils/tempfs.h"
5+
#include "tempfs.h"
66

77
#include <future>
88
#include <string>
@@ -18,7 +18,7 @@
1818
#include <zircon/status.h>
1919
#include <zircon/syscalls.h>
2020

21-
#include "runtime/dart/utils/logging.h"
21+
#include "logging.h"
2222

2323
namespace {
2424

‎shell/platform/fuchsia/runtime/dart/utils/vmo.cc

Lines changed: 2 additions & 2 deletions
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 "runtime/dart/utils/vmo.h"
5+
#include "vmo.h"
66

77
#include <fcntl.h>
88
#include <sys/stat.h>
@@ -14,7 +14,7 @@
1414
#include <lib/syslog/global.h>
1515
#include <zircon/status.h>
1616

17-
#include "runtime/dart/utils/logging.h"
17+
#include "logging.h"
1818

1919
namespace {
2020

‎shell/platform/fuchsia/runtime/dart/utils/vmservice_object.cc

Lines changed: 2 additions & 2 deletions
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 "runtime/dart/utils/vmservice_object.h"
5+
#include "vmservice_object.h"
66

77
#include <dirent.h>
88
#include <errno.h>
@@ -12,7 +12,7 @@
1212
#include <lib/syslog/global.h>
1313
#include <zircon/status.h>
1414

15-
#include "runtime/dart/utils/logging.h"
15+
#include "logging.h"
1616

1717
namespace {
1818

‎vulkan/vulkan_application.cc

Lines changed: 4 additions & 4 deletions
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/vulkan/vulkan_application.h"
5+
#include "vulkan_application.h"
66

77
#include <utility>
88
#include <vector>
99

10-
#include "flutter/vulkan/vulkan_device.h"
11-
#include "flutter/vulkan/vulkan_proc_table.h"
12-
#include "flutter/vulkan/vulkan_utilities.h"
10+
#include "vulkan_device.h"
11+
#include "vulkan_proc_table.h"
12+
#include "vulkan_utilities.h"
1313

1414
namespace vulkan {
1515

‎vulkan/vulkan_application.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
#include <string>
1010
#include <vector>
1111
#include "flutter/fml/macros.h"
12-
#include "flutter/vulkan/vulkan_debug_report.h"
13-
#include "flutter/vulkan/vulkan_handle.h"
12+
#include "vulkan_debug_report.h"
13+
#include "vulkan_handle.h"
1414

1515
namespace vulkan {
1616

‎vulkan/vulkan_backbuffer.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
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/vulkan/vulkan_backbuffer.h"
5+
#include "vulkan_backbuffer.h"
66

77
#include <limits>
88

9-
#include "flutter/vulkan/vulkan_proc_table.h"
109
#include "third_party/skia/include/gpu/vk/GrVkTypes.h"
1110
#include "vulkan/vulkan.h"
11+
#include "vulkan_proc_table.h"
1212

1313
namespace vulkan {
1414

‎vulkan/vulkan_backbuffer.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99

1010
#include "flutter/fml/compiler_specific.h"
1111
#include "flutter/fml/macros.h"
12-
#include "flutter/vulkan/vulkan_command_buffer.h"
13-
#include "flutter/vulkan/vulkan_handle.h"
1412
#include "third_party/skia/include/core/SkSize.h"
1513
#include "third_party/skia/include/core/SkSurface.h"
14+
#include "vulkan_command_buffer.h"
15+
#include "vulkan_handle.h"
1616

1717
namespace vulkan {
1818

‎vulkan/vulkan_command_buffer.cc

Lines changed: 2 additions & 2 deletions
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/vulkan/vulkan_command_buffer.h"
5+
#include "vulkan_command_buffer.h"
66

7-
#include "flutter/vulkan/vulkan_proc_table.h"
7+
#include "vulkan_proc_table.h"
88

99
namespace vulkan {
1010

‎vulkan/vulkan_command_buffer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
#include "flutter/fml/compiler_specific.h"
99
#include "flutter/fml/macros.h"
10-
#include "flutter/vulkan/vulkan_handle.h"
10+
#include "vulkan_handle.h"
1111

1212
namespace vulkan {
1313

‎vulkan/vulkan_debug_report.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
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/vulkan/vulkan_debug_report.h"
5+
#include "vulkan_debug_report.h"
66

77
#include <iomanip>
88
#include <vector>
99

1010
#include "flutter/fml/compiler_specific.h"
11-
#include "flutter/vulkan/vulkan_utilities.h"
11+
#include "vulkan_utilities.h"
1212

1313
namespace vulkan {
1414

‎vulkan/vulkan_debug_report.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
#define FLUTTER_VULKAN_VULKAN_DEBUG_REPORT_H_
77

88
#include "flutter/fml/macros.h"
9-
#include "flutter/vulkan/vulkan_handle.h"
10-
#include "flutter/vulkan/vulkan_interface.h"
11-
#include "flutter/vulkan/vulkan_proc_table.h"
9+
#include "vulkan_handle.h"
10+
#include "vulkan_interface.h"
11+
#include "vulkan_proc_table.h"
1212

1313
namespace vulkan {
1414

‎vulkan/vulkan_device.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
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/vulkan/vulkan_device.h"
5+
#include "vulkan_device.h"
66

77
#include <limits>
88
#include <map>
99
#include <vector>
1010

11-
#include "flutter/vulkan/vulkan_proc_table.h"
12-
#include "flutter/vulkan/vulkan_surface.h"
13-
#include "flutter/vulkan/vulkan_utilities.h"
1411
#include "third_party/skia/include/gpu/vk/GrVkBackendContext.h"
12+
#include "vulkan_proc_table.h"
13+
#include "vulkan_surface.h"
14+
#include "vulkan_utilities.h"
1515

1616
namespace vulkan {
1717

‎vulkan/vulkan_device.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
#include "flutter/fml/compiler_specific.h"
1111
#include "flutter/fml/macros.h"
12-
#include "flutter/vulkan/vulkan_handle.h"
12+
#include "vulkan_handle.h"
1313

1414
namespace vulkan {
1515

‎vulkan/vulkan_image.cc

Lines changed: 3 additions & 3 deletions
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/vulkan/vulkan_image.h"
5+
#include "vulkan_image.h"
66

7-
#include "flutter/vulkan/vulkan_command_buffer.h"
8-
#include "flutter/vulkan/vulkan_proc_table.h"
7+
#include "vulkan_command_buffer.h"
8+
#include "vulkan_proc_table.h"
99

1010
namespace vulkan {
1111

‎vulkan/vulkan_image.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
#include "flutter/fml/compiler_specific.h"
99
#include "flutter/fml/macros.h"
10-
#include "flutter/vulkan/vulkan_handle.h"
10+
#include "vulkan_handle.h"
1111

1212
namespace vulkan {
1313

‎vulkan/vulkan_interface.cc

Lines changed: 1 addition & 1 deletion
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/vulkan/vulkan_interface.h"
5+
#include "vulkan_interface.h"
66

77
namespace vulkan {
88

‎vulkan/vulkan_native_surface.cc

Lines changed: 1 addition & 1 deletion
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/vulkan/vulkan_native_surface.h"
5+
#include "vulkan_native_surface.h"
66

77
namespace vulkan {
88

‎vulkan/vulkan_native_surface_android.cc

Lines changed: 1 addition & 1 deletion
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/vulkan/vulkan_native_surface_android.h"
5+
#include "vulkan_native_surface_android.h"
66

77
#include <android/native_window.h>
88

‎vulkan/vulkan_native_surface_android.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#define FLUTTER_VULKAN_VULKAN_NATIVE_SURFACE_ANDROID_H_
77

88
#include "flutter/fml/macros.h"
9-
#include "flutter/vulkan/vulkan_native_surface.h"
9+
#include "vulkan_native_surface.h"
1010

1111
struct ANativeWindow;
1212
typedef struct ANativeWindow ANativeWindow;

‎vulkan/vulkan_proc_table.cc

Lines changed: 1 addition & 1 deletion
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/vulkan/vulkan_proc_table.h"
5+
#include "vulkan_proc_table.h"
66

77
#include <dlfcn.h>
88

‎vulkan/vulkan_proc_table.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
#include "flutter/fml/macros.h"
99
#include "flutter/fml/memory/ref_counted.h"
1010
#include "flutter/fml/memory/ref_ptr.h"
11-
#include "flutter/vulkan/vulkan_handle.h"
12-
#include "flutter/vulkan/vulkan_interface.h"
1311
#include "third_party/skia/include/core/SkRefCnt.h"
1412
#include "third_party/skia/include/gpu/vk/GrVkBackendContext.h"
13+
#include "vulkan_handle.h"
14+
#include "vulkan_interface.h"
1515

1616
namespace vulkan {
1717

‎vulkan/vulkan_provider.cc

Lines changed: 1 addition & 1 deletion
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/vulkan/vulkan_provider.h"
5+
#include "vulkan_provider.h"
66

77
namespace vulkan {
88

‎vulkan/vulkan_provider.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#ifndef FLUTTER_VULKAN_VULKAN_PROVIDER_H_
66
#define FLUTTER_VULKAN_VULKAN_PROVIDER_H_
77

8-
#include "flutter/vulkan/vulkan_handle.h"
8+
#include "vulkan_handle.h"
99

1010
namespace vulkan {
1111

‎vulkan/vulkan_surface.cc

Lines changed: 3 additions & 3 deletions
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/vulkan/vulkan_surface.h"
5+
#include "vulkan_surface.h"
66

7-
#include "flutter/vulkan/vulkan_application.h"
8-
#include "flutter/vulkan/vulkan_native_surface.h"
7+
#include "vulkan_application.h"
8+
#include "vulkan_native_surface.h"
99

1010
namespace vulkan {
1111

‎vulkan/vulkan_surface.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
#define FLUTTER_VULKAN_VULKAN_SURFACE_H_
77

88
#include "flutter/fml/macros.h"
9-
#include "flutter/vulkan/vulkan_handle.h"
109
#include "third_party/skia/include/core/SkSize.h"
10+
#include "vulkan_handle.h"
1111

1212
namespace vulkan {
1313

0 commit comments

Comments
 (0)