diff --git a/shell/platform/android/hardware_buffer_external_texture.cc b/shell/platform/android/hardware_buffer_external_texture.cc index f9cc5e15e8c86..c9c8473c6cd51 100644 --- a/shell/platform/android/hardware_buffer_external_texture.cc +++ b/shell/platform/android/hardware_buffer_external_texture.cc @@ -3,7 +3,7 @@ #include #include -#include "shell/platform/android/ndk_helpers.h" +#include "flutter/shell/platform/android/ndk_helpers.h" namespace flutter { diff --git a/shell/platform/android/hardware_buffer_external_texture_gl.cc b/shell/platform/android/hardware_buffer_external_texture_gl.cc index 58e2e9faba500..2dfe278433d08 100644 --- a/shell/platform/android/hardware_buffer_external_texture_gl.cc +++ b/shell/platform/android/hardware_buffer_external_texture_gl.cc @@ -7,12 +7,12 @@ #include #include #include "flutter/common/graphics/texture.h" +#include "flutter/shell/platform/android/ndk_helpers.h" #include "impeller/core/formats.h" #include "impeller/display_list/dl_image_impeller.h" #include "impeller/renderer/backend/gles/texture_gles.h" #include "impeller/toolkit/egl/image.h" #include "impeller/toolkit/gles/texture.h" -#include "shell/platform/android/ndk_helpers.h" #include "flutter/display_list/effects/dl_color_source.h" #include "third_party/skia/include/core/SkAlphaType.h" diff --git a/shell/platform/android/ndk_helpers.cc b/shell/platform/android/ndk_helpers.cc index 89291f6b660e6..9ff5d4ea3b6d1 100644 --- a/shell/platform/android/ndk_helpers.cc +++ b/shell/platform/android/ndk_helpers.cc @@ -5,7 +5,6 @@ #include "flutter/shell/platform/android/ndk_helpers.h" #include "fml/native_library.h" -#include "shell/platform/android/ndk_helpers.h" #include "flutter/fml/logging.h" diff --git a/shell/platform/android/platform_view_android.cc b/shell/platform/android/platform_view_android.cc index 6a1f96dead9b1..bf4f962627de7 100644 --- a/shell/platform/android/platform_view_android.cc +++ b/shell/platform/android/platform_view_android.cc @@ -7,19 +7,19 @@ #include #include -#include "common/graphics/texture.h" +#include "flutter/common/graphics/texture.h" #include "flutter/fml/synchronization/waitable_event.h" #include "flutter/shell/common/shell_io_manager.h" #include "flutter/shell/gpu/gpu_surface_gl_delegate.h" #include "flutter/shell/platform/android/android_context_gl_impeller.h" #include "flutter/shell/platform/android/android_context_gl_skia.h" +#include "flutter/shell/platform/android/android_context_vulkan_impeller.h" #include "flutter/shell/platform/android/android_external_texture_gl.h" #include "flutter/shell/platform/android/android_surface_gl_impeller.h" #include "flutter/shell/platform/android/android_surface_gl_skia.h" #include "flutter/shell/platform/android/android_surface_software.h" #include "flutter/shell/platform/android/hardware_buffer_external_texture_gl.h" #include "flutter/shell/platform/android/hardware_buffer_external_texture_vk.h" -#include "shell/platform/android/android_context_vulkan_impeller.h" #if IMPELLER_ENABLE_VULKAN // b/258506856 for why this is behind an if #include "flutter/shell/platform/android/android_surface_vulkan_impeller.h" #endif diff --git a/shell/platform/android/platform_view_android_jni_impl.cc b/shell/platform/android/platform_view_android_jni_impl.cc index 013d48ca254a9..bda5d082bc8c5 100644 --- a/shell/platform/android/platform_view_android_jni_impl.cc +++ b/shell/platform/android/platform_view_android_jni_impl.cc @@ -12,8 +12,8 @@ #include #include +#include "flutter/shell/platform/android/ndk_helpers.h" #include "include/android/SkImageAndroid.h" -#include "shell/platform/android/ndk_helpers.h" #include "unicode/uchar.h" #include "flutter/assets/directory_asset_bundle.h"