!9611 DLP

Merge pull request !9611 from liuzongze/master

frameworks/js/napi/wantConstant/BUILD.gn

@@ -27,6 +27,12 @@ ohos_shared_library("wantconstant") {
     "napi:ace_napi",
   ]
 
+  cflags_cc = []
+  if (os_dlp_part_enabled) {
+    cflags_cc += [ "-DWITH_DLP" ]
+    external_deps += [ "dlp_permission_service:libdlp_permission_sdk" ]
+  }
+
   relative_install_dir = "module/ability"
 
   subsystem_name = "ability"
@@ -46,6 +52,12 @@ ohos_shared_library("wantconstant_napi") {
     "napi:ace_napi",
   ]
 
+  cflags_cc = []
+  if (os_dlp_part_enabled) {
+    cflags_cc += [ "-DWITH_DLP" ]
+    external_deps += [ "dlp_permission_service:libdlp_permission_sdk" ]
+  }
+
   relative_install_dir = "module/app/ability"
 
   defines = [ "ENABLE_ERRCODE" ]

frameworks/simulator/napi_module/want_constant/BUILD.gn

@@ -26,6 +26,13 @@ ohos_shared_library("wantconstant_napi") {
     "hilog:libhilog",
     "napi:ace_napi",
   ]
+
+  cflags_cc = []
+  if (os_dlp_part_enabled) {
+    cflags_cc += [ "-DWITH_DLP" ]
+    external_deps += [ "dlp_permission_service:libdlp_permission_sdk" ]
+  }
+
   part_name = "ability_runtime"
   subsystem_name = "ability"
 }

interfaces/inner_api/ability_manager/include/ability_manager_client.h

@@ -1564,9 +1564,7 @@ private:
 
     sptr<IAbilityManager> GetAbilityManager();
     void ResetProxy(wptr<IRemoteObject> remote);
-#ifdef WITH_DLP
     void HandleDlpApp(Want &want);
-#endif // WITH_DLP
 
     static std::once_flag singletonFlag_;
     std::recursive_mutex mutex_;

interfaces/inner_api/connectionobs_manager/BUILD.gn

@@ -54,6 +54,13 @@ ohos_shared_library("connection_obs_manager") {
     "ipc:ipc_core",
     "samgr:samgr_proxy",
   ]
+
+  cflags_cc = []
+  if (os_dlp_part_enabled) {
+    cflags_cc += [ "-DWITH_DLP" ]
+    external_deps += [ "dlp_permission_service:libdlp_permission_sdk" ]
+  }
+
   public_external_deps = [ "bundle_framework:appexecfwk_base" ]
   innerapi_tags = [ "platformsdk" ]
   subsystem_name = "ability"

services/abilitymgr/include/dlp_utils.h

@@ -89,7 +89,7 @@ using Dlp = Security::DlpPermission::DlpPermissionKit;
 
     return PermissionVerification::GetInstance()->VerifyDlpPermission(const_cast<Want &>(want));
 }
-#endif // WITH_DLP_
+#endif // WITH_DLP
 
 [[maybe_unused]]static bool SandboxAuthCheck(const AbilityRecord &callerRecord, const Want &want)
 {

services/abilitymgr/src/start_ability_handler.cpp

@@ -15,6 +15,7 @@
 
 #include "start_ability_handler.h"
 
+#include "permission_verification.h"
 #ifdef WITH_DLP
 #include "dlp_utils.h"
 #endif // WITH_DLP

services/appmgr/BUILD.gn

@@ -160,7 +160,11 @@ ohos_shared_library("libappms") {
       "window_manager:libwsutils",
     ]
   }
-
+  cflags_cc = []
+  if (os_dlp_part_enabled) {
+    cflags_cc += [ "-DWITH_DLP" ]
+    external_deps += [ "dlp_permission_service:libdlp_permission_sdk" ]
+  }
   if (background_task_mgr_continuous_task_enable) {
     defines += [ "BGTASKMGR_CONTINUOUS_TASK_ENABLE" ]
   }

services/common/BUILD.gn

@@ -70,6 +70,12 @@ ohos_shared_library("perm_verification") {
     "ipc:ipc_core",
   ]
 
+  cflags_cc = []
+  if (os_dlp_part_enabled) {
+    cflags_cc += [ "-DWITH_DLP" ]
+    external_deps += [ "dlp_permission_service:libdlp_permission_sdk" ]
+  }
+
   subsystem_name = "ability"
   innerapi_tags = [ "platformsdk_indirect" ]
   part_name = "ability_runtime"

test/fuzztest/abilityfirstframestateobservermanager_fuzzer/BUILD.gn

@@ -70,6 +70,12 @@ ohos_fuzztest("AbilityFirstFrameStateObserverManagerFuzzTest") {
     "samgr:samgr_proxy",
   ]
 
+  cflags_cc = []
+  if (os_dlp_part_enabled) {
+    cflags_cc += [ "-DWITH_DLP" ]
+    external_deps += [ "dlp_permission_service:libdlp_permission_sdk" ]
+  }
+
   if (ability_runtime_graphics) {
     external_deps += [ "input:libmmi-client" ]
   }

test/moduletest/ability_timeout_module_test/BUILD.gn

@@ -129,6 +129,11 @@ ohos_moduletest("ability_timeout_module_test") {
       "window_manager:sms",
     ]
   }
+
+  if (os_dlp_part_enabled) {
+    cflags_cc += [ "-DWITH_DLP" ]
+    external_deps += [ "dlp_permission_service:libdlp_permission_sdk" ]
+  }
 }
 
 group("moduletest") {

test/moduletest/running_infos_module_test/BUILD.gn

@@ -137,6 +137,10 @@ ohos_moduletest("running_infos_module_test") {
       "window_manager:sms",
     ]
   }
+  if (os_dlp_part_enabled) {
+    cflags_cc += [ "-DWITH_DLP" ]
+    external_deps += [ "dlp_permission_service:libdlp_permission_sdk" ]
+  }
 }
 
 group("moduletest") {

test/unittest/BUILD.gn

@@ -265,6 +265,10 @@ ohos_source_set("abilityms_test_source") {
     cflags_cc += [ "-RESOURCE_SCHEDULE_SERVICE_ENABLE" ]
     external_deps += [ "resource_schedule_service:ressched_client" ]
   }
+  if (os_dlp_part_enabled) {
+    cflags_cc += [ "-DWITH_DLP" ]
+    external_deps += [ "dlp_permission_service:libdlp_permission_sdk" ]
+  }
 
   if (ability_runtime_graphics) {
     sources += [

test/unittest/ability_auto_startup_service_test/BUILD.gn

@@ -71,6 +71,11 @@ ohos_unittest("ability_auto_startup_service_test") {
     "kv_store:distributeddata_inner",
   ]
 
+  cflags_cc = []
+  if (os_dlp_part_enabled) {
+    cflags_cc += [ "-DWITH_DLP" ]
+    external_deps += [ "dlp_permission_service:libdlp_permission_sdk" ]
+  }
   if (ability_runtime_graphics) {
     external_deps += [
       "window_manager:libwsutils",

test/unittest/ability_first_frame_state_observer_manager_test/BUILD.gn

@@ -52,6 +52,12 @@ ohos_unittest("ability_first_frame_state_observer_manager_test") {
     "hilog:libhilog",
     "ipc:ipc_core",
   ]
+
+  cflags_cc = []
+  if (os_dlp_part_enabled) {
+    cflags_cc += [ "-DWITH_DLP" ]
+    external_deps += [ "dlp_permission_service:libdlp_permission_sdk" ]
+  }
 }
 
 group("unittest") {

test/unittest/ability_manager_service_first_test/BUILD.gn

@@ -88,6 +88,11 @@ ohos_unittest("ability_manager_service_first_test") {
       "window_manager:scene_session",
     ]
   }
+  cflags_cc = []
+  if (os_dlp_part_enabled) {
+    cflags_cc += [ "-DWITH_DLP" ]
+    external_deps += [ "dlp_permission_service:libdlp_permission_sdk" ]
+  }
 }
 
 group("unittest") {

test/unittest/ability_manager_service_fourth_test/BUILD.gn

@@ -101,6 +101,11 @@ ohos_unittest("ability_manager_service_fourth_test") {
       "window_manager:scene_session",
     ]
   }
+  cflags_cc = []
+  if (os_dlp_part_enabled) {
+    cflags_cc += [ "-DWITH_DLP" ]
+    external_deps += [ "dlp_permission_service:libdlp_permission_sdk" ]
+  }
 }
 
 group("unittest") {

test/unittest/ability_record_test/BUILD.gn

@@ -176,6 +176,11 @@ ohos_unittest("ability_record_test_call") {
   if (ability_runtime_graphics) {
     external_deps += [ "window_manager:libwm" ]
   }
+  cflags_cc = []
+  if (os_dlp_part_enabled) {
+    cflags_cc += [ "-DWITH_DLP" ]
+    external_deps += [ "dlp_permission_service:libdlp_permission_sdk" ]
+  }
 }
 
 group("unittest") {

test/unittest/ams_ability_running_record_test/BUILD.gn

@@ -95,6 +95,10 @@ ohos_unittest("AmsAbilityRunningRecordTest") {
     external_deps += [ "sandbox_manager:libsandbox_manager_sdk" ]
     defines = [ "ABILITY_RUNTIME_FEATURE_SANDBOXMANAGER" ]
   }
+  if (os_dlp_part_enabled) {
+    cflags_cc += [ "-DWITH_DLP" ]
+    external_deps += [ "dlp_permission_service:libdlp_permission_sdk" ]
+  }
 }
 
 group("unittest") {

test/unittest/ams_app_life_cycle_test/BUILD.gn

@@ -81,6 +81,11 @@ ohos_unittest("AmsAppLifeCycleTest") {
     "memory_utils:libmeminfo",
     "resource_schedule_service:ressched_client",
   ]
+
+  if (os_dlp_part_enabled) {
+    cflags_cc += [ "-DWITH_DLP" ]
+    external_deps += [ "dlp_permission_service:libdlp_permission_sdk" ]
+  }
 }
 
 group("unittest") {

test/unittest/ams_app_workflow_test/BUILD.gn

@@ -81,6 +81,10 @@ ohos_unittest("AmsWorkFlowTest") {
     "resource_schedule_service:ressched_client",
   ]
 
+  if (os_dlp_part_enabled) {
+    cflags_cc += [ "-DWITH_DLP" ]
+    external_deps += [ "dlp_permission_service:libdlp_permission_sdk" ]
+  }
   if (ability_runtime_graphics) {
     external_deps += [
       "window_manager:libwm",

test/unittest/ams_mgr_scheduler_test/BUILD.gn

@@ -83,6 +83,11 @@ ohos_unittest("ams_mgr_scheduler_test") {
       "window_manager:libwm",
     ]
   }
+  cflags_cc = []
+  if (os_dlp_part_enabled) {
+    cflags_cc += [ "-DWITH_DLP" ]
+    external_deps += [ "dlp_permission_service:libdlp_permission_sdk" ]
+  }
 }
 
 group("unittest") {

test/unittest/ams_recent_app_list_test/BUILD.gn

@@ -98,6 +98,10 @@ ohos_unittest("AmsRecentAppListTest") {
     "resource_schedule_service:ressched_client",
   ]
 
+  if (os_dlp_part_enabled) {
+    cflags_cc += [ "-DWITH_DLP" ]
+    external_deps += [ "dlp_permission_service:libdlp_permission_sdk" ]
+  }
   if (ability_runtime_graphics) {
     external_deps += [
       "window_manager:libwm",

test/unittest/ams_service_app_spawn_client_test/BUILD.gn

@@ -97,6 +97,11 @@ ohos_unittest("AmsServiceAppSpawnClientTest") {
     external_deps += [ "window_manager:libwm" ]
   }
 
+  if (os_dlp_part_enabled) {
+    cflags_cc += [ "-DWITH_DLP" ]
+    external_deps += [ "dlp_permission_service:libdlp_permission_sdk" ]
+  }
+
   subsystem_name = "ability"
   part_name = "ability_runtime"
 }

test/unittest/ams_service_event_drive_test/BUILD.gn

@@ -100,6 +100,10 @@ ohos_unittest("AmsServiceEventDriveTest") {
   if (ability_runtime_graphics) {
     external_deps += [ "window_manager:libwm" ]
   }
+  if (os_dlp_part_enabled) {
+    cflags_cc += [ "-DWITH_DLP" ]
+    external_deps += [ "dlp_permission_service:libdlp_permission_sdk" ]
+  }
 }
 
 group("unittest") {

test/unittest/ams_service_load_ability_process_test/BUILD.gn

@@ -112,6 +112,11 @@ ohos_unittest("AmsServiceLoadAbilityProcessTest") {
     external_deps += [ "sandbox_manager:libsandbox_manager_sdk" ]
     defines = [ "ABILITY_RUNTIME_FEATURE_SANDBOXMANAGER" ]
   }
+
+  if (os_dlp_part_enabled) {
+    cflags_cc += [ "-DWITH_DLP" ]
+    external_deps += [ "dlp_permission_service:libdlp_permission_sdk" ]
+  }
 }
 
 group("unittest") {

test/unittest/ams_service_startup_test/BUILD.gn

@@ -100,6 +100,10 @@ ohos_unittest("AmsServiceStartupTest") {
     external_deps += [ "sandbox_manager:libsandbox_manager_sdk" ]
     defines = [ "ABILITY_RUNTIME_FEATURE_SANDBOXMANAGER" ]
   }
+  if (os_dlp_part_enabled) {
+    cflags_cc += [ "-DWITH_DLP" ]
+    external_deps += [ "dlp_permission_service:libdlp_permission_sdk" ]
+  }
 }
 
 group("unittest") {

test/unittest/app_mgr_service_event_handler_test/BUILD.gn

@@ -95,7 +95,10 @@ ohos_unittest("AMSEventHandlerTest") {
     "memory_utils:libmeminfo",
     "resource_schedule_service:ressched_client",
   ]
-
+  if (os_dlp_part_enabled) {
+    cflags_cc += [ "-DWITH_DLP" ]
+    external_deps += [ "dlp_permission_service:libdlp_permission_sdk" ]
+  }
   if (ability_runtime_graphics) {
     external_deps += [
       "window_manager:libwm",

test/unittest/extension_permissions_util_test/BUILD.gn

@@ -50,6 +50,11 @@ ohos_unittest("extension_permissions_util_test") {
     "c_utils:utils",
     "hilog:libhilog",
   ]
+  cflags_cc = []
+  if (os_dlp_part_enabled) {
+    cflags_cc += [ "-DWITH_DLP" ]
+    external_deps += [ "dlp_permission_service:libdlp_permission_sdk" ]
+  }
 }
 
 group("unittest") {

test/unittest/services/ability_util_test/BUILD.gn

@@ -44,6 +44,12 @@ ohos_unittest("ability_util_test") {
     "hilog:libhilog",
     "hitrace:hitrace_meter",
   ]
+
+  cflags_cc = []
+  if (os_dlp_part_enabled) {
+    cflags_cc += [ "-DWITH_DLP" ]
+    external_deps += [ "dlp_permission_service:libdlp_permission_sdk" ]
+  }
 }
 
 group("unittest") {

test/unittest/uri_permission_impl_test/BUILD.gn

@@ -70,6 +70,11 @@ ohos_unittest("uri_permission_impl_test") {
     "init:libbegetutil",
     "storage_service:storage_manager_sa_proxy",
   ]
+  cflags_cc = []
+  if (os_dlp_part_enabled) {
+    cflags_cc += [ "-DWITH_DLP" ]
+    external_deps += [ "dlp_permission_service:libdlp_permission_sdk" ]
+  }
 }
 
 group("unittest") {