From 8003ff05055a1d3acfd0fb8a2c9b6c215914fe76 Mon Sep 17 00:00:00 2001 From: peter Date: Fri, 29 Apr 2022 14:24:58 +0800 Subject: [PATCH] cherry-pick Signed-off-by: peter Change-Id: Ieba47beacbdc60d0b69ce353fa29ee24ba2a74b4 --- adapter/ohos/build/bundle.json | 1 - adapter/preview/entrance/BUILD.gn | 10 ++++++++-- build/external_config/flutter/glfw/BUILD.gn | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/adapter/ohos/build/bundle.json b/adapter/ohos/build/bundle.json index 8b83ec4d..757b6ebd 100644 --- a/adapter/ohos/build/bundle.json +++ b/adapter/ohos/build/bundle.json @@ -46,7 +46,6 @@ "expat", "flutter", "freetype", - "glfw", "libpng", "parse5", "qrcodegen", diff --git a/adapter/preview/entrance/BUILD.gn b/adapter/preview/entrance/BUILD.gn index afa5453e..8576af73 100644 --- a/adapter/preview/entrance/BUILD.gn +++ b/adapter/preview/entrance/BUILD.gn @@ -41,13 +41,19 @@ template("preview_entrance_source") { if (!is_cross_platform_build) { if (platform == "windows") { defines -= [ "UNICODE" ] - include_dirs = [ "//utils/native/base/include" ] + include_dirs = [ + "//utils/native/base/include", + "//third_party/flutter/glfw/include", + ] deps += [ "//base/global/resmgr_standard/frameworks/resmgr:global_resmgr_win(${current_toolchain})" ] cflags_cc += [ "-DNONLS" ] } if (platform == "mac") { - include_dirs = [ "//utils/native/base/include" ] + include_dirs = [ + "//utils/native/base/include", + "//third_party/flutter/glfw/include", + ] deps += [ "//base/global/resmgr_standard/frameworks/resmgr:global_resmgr_mac(${current_toolchain})" ] } } diff --git a/build/external_config/flutter/glfw/BUILD.gn b/build/external_config/flutter/glfw/BUILD.gn index 18882b07..1c532b4e 100644 --- a/build/external_config/flutter/glfw/BUILD.gn +++ b/build/external_config/flutter/glfw/BUILD.gn @@ -139,7 +139,7 @@ template("flutter_platform_glfw") { # wait for glfw enabled in standard system if (!is_standard_system || use_mingw_win || use_mac) { - deps += [ "//third_party/glfw:glfw_$platform" ] + deps += [ "$flutter_root/glfw:glfw_$platform" ] } } }