windowExtension单独一个so

Signed-off-by: lu <zhaolu2@huawei.com>
Change-Id: I9d2f548ba5dc460b8c387f227f02eda4314c0aa7

bundle.json

@@ -52,6 +52,7 @@
           "//foundation/windowmanager/dm:libdm",
           "//foundation/windowmanager/dmserver:libdms",
           "//foundation/windowmanager/extension/extension_connection:libwindowextension",
+          "//foundation/windowmanager/extension/window_extension:libwe",
           "//foundation/windowmanager/wm:libwm",
           "//foundation/windowmanager/wmserver:libwms",
           "//foundation/windowmanager/utils:libwmutil",

extension/extension_connection/src/window_extension_server_proxy.cpp

@@ -30,7 +30,8 @@ void WindowExtensionServerProxy::OnWindowReady(const std::shared_ptr<RSSurfaceNo
     MessageParcel replay;
     MessageOption option;
 
-    if (!data.WriteInterfaceToken(GetDescriptor())) {
+    if (!data.WriteInterfaceToken(GetDescri
+    ptor())) {
         WLOGFE("write token failed");
         return;
     }

extension/window_extension/BUILD.gn

@@ -0,0 +1,90 @@
+# Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import("//build/ohos.gni")
+
+config("libwe_private_config") {
+  visibility = [ ":*" ]
+
+  include_dirs = [
+    "include",
+    "../../wmserver/include",
+    "//foundation/aafwk/standard/frameworks/kits/ability/ability_runtime/include",
+    "//foundation/aafwk/standard/interfaces/innerkits/ability_manager/include",
+    "//foundation/aafwk/standard/interfaces/innerkits/app_manager/include/appmgr",
+    "//third_party/jsoncpp/include",
+    "//third_party/json/include",
+  ]
+}
+
+config("libwe_public_config") {
+  include_dirs = [
+    "../../interfaces/innerkits/wm",
+    "../../utils/include",
+  ]
+}
+
+## Build libwe.so
+ohos_shared_library("libwe") {
+  sources = [
+    "src/js_window_extension_context.cpp",
+    "src/js_window_extension.cpp",
+    "src/window_extension_client_proxy.cpp",
+    "src/window_extension_client_stub.cpp",
+    "src/window_extension_client_stub_impl.cpp",
+    "src/window_extension_module_loader.cpp",
+    "src/window_extension.cpp",
+  ]
+
+  configs = [ ":libwe_private_config" ]
+
+  public_configs = [ ":libwe_public_config" ]
+
+  deps = [
+    "//foundation/graphic/standard/rosen/modules/render_service_client:librender_service_client",
+    "//foundation/windowmanager/wm:libwm",
+    "//foundation/windowmanager/utils:libwmutil",
+
+    # vsync
+    "//foundation/graphic/standard/rosen/modules/composer:libcomposer",
+  ]
+
+  external_deps = [
+    "ability_base:want",
+    "ability_runtime:ability_context_native",
+    "ability_runtime:ability_manager",
+    "ability_runtime:runtime",
+    "ability_runtime:abilitykit_native",
+    "ace_engine_standard:ace_uicontent",
+    "bundle_framework:appexecfwk_base",
+    "bundle_framework:appexecfwk_core",
+    "bytrace_standard:bytrace_core",
+    "graphic_standard:surface",
+    "hilog_native:libhilog",
+    "input:libmmi-client",
+    "inputmethod_native:inputmethod_client",
+    "ipc:ipc_core",
+    "multimedia_image_standard:image_native",
+    "napi:ace_napi",
+    "power_manager_native:powermgr_client",
+
+    # because appexecfwk_core depends on global_resmgr
+    "resmgr_standard:global_resmgr",
+    "safwk:system_ability_fwk",
+    "samgr_standard:samgr_proxy",
+    "utils_base:utils",
+  ]
+
+  part_name = "window_manager"
+  subsystem_name = "window"
+}

extension/window_extension/src/window_extension_client_proxy.cpp

@@ -72,5 +72,10 @@ void WindowExtensionClientProxy::Show()
         WLOGFE("send request failed");
     }
 }
+
+void WindowExtensionClientProxy::RequestFocus()
+{
+
+}
 } // namespace Rosen
 } // namespace OHOS

wm/BUILD.gn

@@ -18,7 +18,6 @@ config("libwm_private_config") {
 
   include_dirs = [
     "include",
-    "../extension/window_extension/include",
     "../wmserver/include",
     "//foundation/aafwk/standard/frameworks/kits/ability/ability_runtime/include",
     "//foundation/aafwk/standard/interfaces/innerkits/ability_manager/include",
@@ -38,13 +37,6 @@ config("libwm_public_config") {
 ## Build libwm.so
 ohos_shared_library("libwm") {
   sources = [
-    "../extension/window_extension/src/js_window_extension_context.cpp",
-    "../extension/window_extension/src/js_window_extension.cpp",
-    "../extension/window_extension/src/window_extension_client_proxy.cpp",
-    "../extension/window_extension/src/window_extension_client_stub.cpp",
-    "../extension/window_extension/src/window_extension_client_stub_impl.cpp",
-    "../extension/window_extension/src/window_extension_module_loader.cpp",
-    "../extension/window_extension/src/window_extension.cpp",
     "../wmserver/src/window_manager_proxy.cpp",
     "src/color_parser.cpp",
     "src/input_transfer_station.cpp",
@@ -80,7 +72,6 @@ ohos_shared_library("libwm") {
     "ability_base:want",
     "ability_runtime:ability_context_native",
     "ability_runtime:ability_manager",
-    "ability_runtime:runtime",
     "ace_engine_standard:ace_uicontent",
     "bundle_framework:appexecfwk_base",
     "bundle_framework:appexecfwk_core",