cherry-pick

Signed-off-by: peter <zhuzijia@huawei.com>
Change-Id: Ieba47beacbdc60d0b69ce353fa29ee24ba2a74b4

adapter/ohos/build/bundle.json

@@ -46,7 +46,6 @@
                 "expat",
                 "flutter",
                 "freetype",
-                "glfw",
                 "libpng",
                 "parse5",
                 "qrcodegen",

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})" ]
       }
     }

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" ]
     }
   }
 }