!9515 部件单模块化整改

Merge pull request !9515 from 李明康/319modulde

bundle.json

@@ -80,7 +80,11 @@
           "memmgr_plugin",
           "sensor",
           "qos_manager",
-          "video_processing_engine"
+          "video_processing_engine",
+          "bounds_checking_function",
+          "egl",
+          "opengles",
+          "node"
         ],
         "third_party": [
           "flutter",

frameworks/opengl_wrapper/BUILD.gn

@@ -42,10 +42,8 @@ config("egl_public_config") {
 
 if (current_os != "ohos") {
   group("EGL") {
-    public_deps = [
-      "//third_party/EGL:libEGL",
-      "//third_party/openGLES:libGLES",
-    ]
+    public_external_deps = [ "egl:libEGL" ]
+    public_deps = [ "//third_party/openGLES:libGLES" ]
   }
 } else {
   ohos_shared_library("EGL") {
@@ -70,11 +68,8 @@ if (current_os != "ohos") {
 
     public_configs = [ ":egl_public_config" ]
 
-    public_deps = [
-      "//third_party/EGL:libEGL",
-      "//third_party/openGLES:libGLES",
-    ]
-
+    public_external_deps = [ "egl:libEGL" ]
+    public_deps = [ "//third_party/openGLES:libGLES" ]
     external_deps = [
       "c_utils:utils",
       "hilog:libhilog",
@@ -121,10 +116,8 @@ ohos_shared_library("GLESv1") {
 
   public_configs = [ ":glesv1_public_config" ]
 
-  public_deps = [
-    "//third_party/EGL:libEGL",
-    "//third_party/openGLES:libGLES",
-  ]
+  public_external_deps = [ "egl:libEGL" ]
+  public_deps = [ "//third_party/openGLES:libGLES" ]
 
   external_deps = [ "hilog:libhilog" ]
 
@@ -161,10 +154,8 @@ ohos_shared_library("GLESv2") {
 
   public_configs = [ ":glesv2_public_config" ]
 
-  public_deps = [
-    "//third_party/EGL:libEGL",
-    "//third_party/openGLES:libGLES",
-  ]
+  public_external_deps = [ "egl:libEGL" ]
+  public_deps = [ "//third_party/openGLES:libGLES" ]
 
   external_deps = [ "hilog:libhilog" ]
 
@@ -194,10 +185,8 @@ config("glesv3_public_config") {
 
 if (current_os != "ohos") {
   group("GLESv3") {
-    public_deps = [
-      "//third_party/EGL:libEGL",
-      "//third_party/openGLES:libGLES",
-    ]
+    public_external_deps = [ "egl:libEGL" ]
+    public_deps = [ "//third_party/openGLES:libGLES" ]
   }
 } else {
   ohos_shared_library("GLESv3") {
@@ -206,10 +195,8 @@ if (current_os != "ohos") {
 
     public_configs = [ ":glesv3_public_config" ]
 
-    public_deps = [
-      "//third_party/EGL:libEGL",
-      "//third_party/openGLES:libGLES",
-    ]
+    public_external_deps = [ "egl:libEGL" ]
+    public_deps = [ "//third_party/openGLES:libGLES" ]
 
     external_deps = [ "hilog:libhilog" ]
 
@@ -280,7 +267,7 @@ ohos_shared_library("debug_layer_test1") {
 
   public_configs = [ ":debug_layer_test_public_config" ]
 
-  public_deps = [ "//third_party/EGL:libEGL" ]
+  public_external_deps = [ "egl:libEGL" ]
 
   external_deps = [ "hilog:libhilog" ]
 
@@ -296,7 +283,7 @@ ohos_shared_library("debug_layer_test2") {
 
   public_configs = [ ":debug_layer_test_public_config" ]
 
-  public_deps = [ "//third_party/EGL:libEGL" ]
+  public_external_deps = [ "egl:libEGL" ]
 
   external_deps = [ "hilog:libhilog" ]
 

frameworks/opengl_wrapper/src/EGL/egl.cpp

@@ -14,8 +14,8 @@
  */
 #include "egl_core.h"
 #include "egl_defs.h"
-#include "../wrapper_log.h"
-#include "../thread_private_data_ctl.h"
+#include "wrapper_log.h"
+#include "thread_private_data_ctl.h"
 
 #undef CALL_HOOK_API
 #define CALL_HOOK_API(api, ...)                                         \
@@ -45,7 +45,7 @@
 
 extern "C" {
 #pragma GCC diagnostic ignored "-Wunused-parameter"
-#include "../egl_hook_entries.in"
+#include "egl_hook_entries.in"
 
 OHOS::GlHookTable *GetHookTable()
 {

frameworks/opengl_wrapper/src/EGL/egl_blob_cache.cpp

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 #include "egl_blob_cache.h"
-#include "../wrapper_log.h"
+#include "wrapper_log.h"
 #include <sys/stat.h>
 #include <sys/mman.h>
 #include <errors.h>

frameworks/opengl_wrapper/src/EGL/egl_core.cpp

@@ -23,7 +23,7 @@
 #if USE_IGRAPHICS_EXTENDS_HOOKS
 #include "egl_wrapper_hook.h"
 #endif
-#include "../wrapper_log.h"
+#include "wrapper_log.h"
 
 namespace OHOS {
 EglWrapperDispatchTable gWrapperHook;
@@ -43,27 +43,27 @@ GlHookTable g_glHookSingle;
 #define HOOK_API_ENTRY(r, api, ...) #api,
 
 char const * const gWrapperApiNames[EGL_API_NUM] = {
-#include "../wrapper_hook_entries.in"
+#include "wrapper_hook_entries.in"
     nullptr
 };
 
 char const * const gEglApiNames[EGL_API_NUM] = {
-#include "../egl_hook_entries.in"
+#include "egl_hook_entries.in"
     nullptr
 };
 
 char const * const gGlApiNames1[GL_API_NUM] = {
-#include "../gl1_hook_entries.in"
+#include "gl1_hook_entries.in"
     nullptr
 };
 
 char const * const gGlApiNames2[GL_API_NUM] = {
-#include "../gl2_hook_entries.in"
+#include "gl2_hook_entries.in"
     nullptr
 };
 
 char const * const gGlApiNames3[GL_API_NUM] = {
-#include "../gl3_hook_entries.in"
+#include "gl3_hook_entries.in"
     nullptr
 };
 

frameworks/opengl_wrapper/src/EGL/egl_defs.h

@@ -18,7 +18,7 @@
 #include <map>
 
 #include "egl_wrapper_entry.h"
-#include "../hook.h"
+#include "hook.h"
 namespace OHOS {
 struct EglWrapperDispatchTable {
     enum { GLESV1_INDEX = 0, GLESV2_INDEX = 1 };

frameworks/opengl_wrapper/src/EGL/egl_pre_initializer.h

@@ -15,8 +15,8 @@
 #ifndef FRAMEWORKS_OPENGL_WRAPPER_EGL_PRE_INITIALIZER_H
 #define FRAMEWORKS_OPENGL_WRAPPER_EGL_PRE_INITIALIZER_H
 #include "egl_defs.h"
-#include "../thread_private_data_ctl.h"
-#include "../wrapper_log.h"
+#include "thread_private_data_ctl.h"
+#include "wrapper_log.h"
 
 namespace OHOS {
 class EglPreInitializer {

frameworks/opengl_wrapper/src/EGL/egl_wrapper_context.cpp

@@ -14,7 +14,7 @@
  */
 #include "egl_wrapper_context.h"
 
-#include "../wrapper_log.h"
+#include "wrapper_log.h"
 namespace OHOS {
 EglWrapperContext::EglWrapperContext(EglWrapperDisplay *disp, EGLContext context, EGLint version)
     : EglWrapperObject(disp), context_(context), read_(nullptr), draw_(nullptr), version_(version)

frameworks/opengl_wrapper/src/EGL/egl_wrapper_display.cpp

@@ -21,8 +21,8 @@
 #endif
 #include "egl_wrapper_context.h"
 #include "egl_wrapper_surface.h"
-#include "../thread_private_data_ctl.h"
-#include "../wrapper_log.h"
+#include "thread_private_data_ctl.h"
+#include "wrapper_log.h"
 #include "egl_blob_cache.h"
 namespace OHOS {
 EglWrapperDisplay EglWrapperDisplay::wrapperDisp_;

frameworks/opengl_wrapper/src/EGL/egl_wrapper_entry.cpp

@@ -25,8 +25,8 @@
 #include "egl_wrapper_context.h"
 #include "egl_wrapper_display.h"
 #include "egl_wrapper_loader.h"
-#include "../thread_private_data_ctl.h"
-#include "../wrapper_log.h"
+#include "thread_private_data_ctl.h"
+#include "wrapper_log.h"
 #include "egl_blob_cache.h"
 
 using namespace OHOS;

frameworks/opengl_wrapper/src/EGL/egl_wrapper_entry.h

@@ -18,7 +18,7 @@
 #include <string>
 #include <EGL/egl.h>
 
-#include "../thread_private_data_ctl.h"
+#include "thread_private_data_ctl.h"
 
 using EglWrapperFuncPointer = __eglMustCastToProperFunctionPointerType;
 

frameworks/opengl_wrapper/src/EGL/egl_wrapper_layer.cpp

@@ -20,7 +20,7 @@
 #include <parameters.h>
 #include <sstream>
 
-#include "../wrapper_log.h"
+#include "wrapper_log.h"
 
 namespace OHOS {
 namespace {

frameworks/opengl_wrapper/src/EGL/egl_wrapper_loader.cpp

@@ -21,7 +21,7 @@
 #include "directory_ex.h"
 
 #include "egl_defs.h"
-#include "../wrapper_log.h"
+#include "wrapper_log.h"
 
 using namespace OHOS;
 namespace OHOS {

frameworks/opengl_wrapper/src/EGL/egl_wrapper_object.cpp

@@ -16,7 +16,7 @@
 #include "egl_wrapper_object.h"
 
 #include "egl_wrapper_display.h"
-#include "../wrapper_log.h"
+#include "wrapper_log.h"
 namespace OHOS {
 EglWrapperObject::EglWrapperObject(EglWrapperDisplay *disp) : display_(disp)
 {

frameworks/opengl_wrapper/src/EGL/egl_wrapper_surface.cpp

@@ -14,7 +14,7 @@
  */
 #include "egl_wrapper_surface.h"
 
-#include "../wrapper_log.h"
+#include "wrapper_log.h"
 
 namespace OHOS {
 EglWrapperSurface::EglWrapperSurface(EglWrapperDisplay *disp, EGLSurface surf)

frameworks/opengl_wrapper/src/GLES1/gles1.cpp

@@ -12,9 +12,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "../hook.h"
-#include "../thread_private_data_ctl.h"
-#include "../wrapper_log.h"
+#include "hook.h"
+#include "thread_private_data_ctl.h"
+#include "wrapper_log.h"
 
 #undef CALL_HOOK_API
 #define CALL_HOOK_API(api, ...)                                                         \
@@ -45,6 +45,6 @@
 
 extern "C" {
 #pragma GCC diagnostic ignored "-Wunused-parameter"
-#include "../gl1_hook_entries.in"
+#include "gl1_hook_entries.in"
 #pragma GCC diagnostic warning "-Wunused-parameter"
 }

frameworks/opengl_wrapper/src/GLES2/gles2.cpp

@@ -12,9 +12,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "../hook.h"
-#include "../thread_private_data_ctl.h"
-#include "../wrapper_log.h"
+#include "hook.h"
+#include "thread_private_data_ctl.h"
+#include "wrapper_log.h"
 
 #undef CALL_HOOK_API
 #define CALL_HOOK_API(api, ...)                                                         \
@@ -45,6 +45,6 @@
 
 extern "C" {
 #pragma GCC diagnostic ignored "-Wunused-parameter"
-#include "../gl2_hook_entries.in"
+#include "gl2_hook_entries.in"
 #pragma GCC diagnostic warning "-Wunused-parameter"
 }

frameworks/opengl_wrapper/src/GLES3/gles3.cpp

@@ -16,9 +16,9 @@
 #include <dlfcn.h>
 #include <string>
 
-#include "../hook.h"
-#include "../thread_private_data_ctl.h"
-#include "../wrapper_log.h"
+#include "hook.h"
+#include "thread_private_data_ctl.h"
+#include "wrapper_log.h"
 
 using GetGlHookTableFunc = OHOS::GlHookTable* (*)();
 template<typename Func = void*>
@@ -68,6 +68,6 @@ GetGlHookTableFunc g_pfnGetGlHookTable = GetEglApi<GetGlHookTableFunc>("GetHookT
 
 extern "C" {
 #pragma GCC diagnostic ignored "-Wunused-parameter"
-#include "../gl3_hook_entries.in"
+#include "gl3_hook_entries.in"
 #pragma GCC diagnostic warning "-Wunused-parameter"
 }

frameworks/opengl_wrapper/test/debug_layer_test1.cpp

@@ -17,7 +17,7 @@
 
 #include <string>
 
-#include "../src/wrapper_log.h"
+#include "wrapper_log.h"
 
 namespace {
 constexpr const char *MY_LOG_TAG = "DebugLayerTest1";

frameworks/opengl_wrapper/test/debug_layer_test2.cpp

@@ -17,7 +17,7 @@
 
 #include <string>
 
-#include "../src/wrapper_log.h"
+#include "wrapper_log.h"
 
 namespace {
 constexpr const char *MY_LOG_TAG = "DebugLayerTest2";

interfaces/kits/napi/graphic/webgl/BUILD.gn

@@ -25,8 +25,6 @@ ohos_source_set("webgl_src") {
     "$graphic_2d_root/interfaces/inner_api/surface",
     "$graphic_2d_root/interfaces/kits/napi/graphic/webgl/include",
     "$graphic_2d_root/interfaces/kits/napi/graphic/webgl/common",
-    "//third_party/node/src",
-    "//commonlibrary/c_utils/base/include",
   ]
 
   sources = [
@@ -36,16 +34,16 @@ ohos_source_set("webgl_src") {
   ]
 
   external_deps = [
+    "c_utils:utils",
+    "egl:libEGL",
     "hilog:libhilog",
     "image_framework:image_native",
     "napi:ace_napi",
+    "node:node_header_notice",
   ]
 
   if (ace_enable_gpu) {
-    include_dirs += [
-      "//third_party/EGL/api",
-      "//third_party/openGLES/api",
-    ]
+    include_dirs += [ "//third_party/openGLES/api" ]
 
     sources += [
       "src/egl_manager.cpp",
@@ -80,10 +78,8 @@ ohos_source_set("webgl_src") {
       "src/webgl_vertex_array_object.cpp",
     ]
 
-    deps = [
-      "$graphic_2d_root:libgl",
-      "//third_party/bounds_checking_function:libsec_shared",
-    ]
+    deps = [ "$graphic_2d_root:libgl" ]
+    external_deps += [ "bounds_checking_function:libsec_shared" ]
   }
 
   cflags = [

rosen/modules/platform/BUILD.gn

@@ -163,7 +163,7 @@ ohos_source_set("mock_utils") {
       "utils/parcel.cpp",
       "utils/refbase.cpp",
     ]
-    public_deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
+    public_external_deps = [ "bounds_checking_function:libsec_shared" ]
   }
   part_name = "graphic_2d"
   subsystem_name = "graphic"

utils/color_manager/BUILD.gn

@@ -67,11 +67,8 @@ color_manager_source_set("color_manager_source") {
 
 if (current_os == "ohos") {
   ohos_shared_library("color_manager") {
-    public_deps = [
-      ":color_manager_source",
-      "//third_party/bounds_checking_function:libsec_shared",
-    ]
-
+    public_deps = [ ":color_manager_source" ]
+    public_external_deps = [ "bounds_checking_function:libsec_shared" ]
     if (defined(use_new_skia) && use_new_skia) {
       public_deps += [ "$skia_root_new:skia_ohos" ]
     } else {