diff --git a/framework/extension/BUILD.gn b/framework/extension/BUILD.gn index 0d098981f07196f1545e3e353593e96b3fa080d6..6709ae9a163960385f2282588d0ce468a01f1e0f 100644 --- a/framework/extension/BUILD.gn +++ b/framework/extension/BUILD.gn @@ -24,8 +24,6 @@ config("enterprise_admin_config") { "${aafwk_path}/frameworks/native/ability/native/", "//foundation/arkui/napi/native_engine", "${SUBSYSTEM_DIR}/common/native/include", - "//commonlibrary/c_utils/base:utils_config", - "//commonlibrary/c_utils/base/include", ] } diff --git a/interfaces/inner_api/BUILD.gn b/interfaces/inner_api/BUILD.gn index 10918748cd9ac64d9635abf9ae3ad1a4dcd75d98..7bc5df7d658e188863359203792cfe5fd69c75f5 100644 --- a/interfaces/inner_api/BUILD.gn +++ b/interfaces/inner_api/BUILD.gn @@ -20,7 +20,6 @@ INCLUDE_PATH = "$ROOT/include" config("edmservice_kits_config") { include_dirs = [ - "//commonlibrary/c_utils/base/include", "include", "$SUBSYSTEM_DIR/common/native/include", ] diff --git a/services/edm/BUILD.gn b/services/edm/BUILD.gn index c0458cabd74e87d3ccc0465a3cf949ce0fa3bb92..c2a0b2ffc72dfb713ff8900ff53246832639991b 100644 --- a/services/edm/BUILD.gn +++ b/services/edm/BUILD.gn @@ -21,10 +21,8 @@ JSONCPP_INCLUDE_DIR = "//third_party/jsoncpp/include" config("edm_config") { cflags = [ "-Wno-error=implicit-fallthrough" ] include_dirs = [ - "//commonlibrary/c_utils/base/include", "include", "include/utils", - "//commonlibrary/c_utils/base:utils_config", JSONCPP_INCLUDE_DIR, "$SUBSYSTEM_DIR/common/native/include", "$SUBSYSTEM_DIR/framework/extension/include", diff --git a/services/edm_plugin/plugin.gni b/services/edm_plugin/plugin.gni index 9e0d61c7861ab22253698c2c9bbc8d6266ab90ab..3d844b79f53a4e9ca0ac51ae0e8ebbefb8e73ad5 100644 --- a/services/edm_plugin/plugin.gni +++ b/services/edm_plugin/plugin.gni @@ -18,13 +18,11 @@ template("edm_plugin_shared_library") { forward_variables_from(invoker, "*") include_dirs += [ - "//utils/native/base/include", "//utils/system/safwk/native/include", "//base/customization/enterprise_device_management/services/edm/include", "//base/customization/enterprise_device_management/interfaces/inner_api/include", "//base/customization/enterprise_device_management/services/edm/include/utils", "//base/customization/enterprise_device_management/services/edm_plugin/include", - "//utils/native/base:utils_config", "//third_party/jsoncpp/include", ] if (defined(invoker.include_dirs)) { @@ -38,10 +36,7 @@ template("edm_plugin_shared_library") { if (!defined(deps)) { deps = [] } - deps += [ - "//base/customization/enterprise_device_management/services/edm:edmservice", - "//utils/native/base:utils", - ] + deps += [ "//base/customization/enterprise_device_management/services/edm:edmservice" ] if (defined(invoker.deps)) { deps += invoker.deps @@ -49,6 +44,7 @@ template("edm_plugin_shared_library") { external_deps += [ "bundle_framework:appexecfwk_base", + "c_utils:utils", "ipc:ipc_core", "safwk:system_ability_fwk", "samgr_standard:samgr_proxy", diff --git a/test/fuzztest/disablesuperadmin_fuzzer/BUILD.gn b/test/fuzztest/disablesuperadmin_fuzzer/BUILD.gn index 82d1a2f58ac398f14c2ac5282eb270834b2d9234..999c37e174a8224697a01ebe81f75fcb7025ff57 100644 --- a/test/fuzztest/disablesuperadmin_fuzzer/BUILD.gn +++ b/test/fuzztest/disablesuperadmin_fuzzer/BUILD.gn @@ -27,10 +27,8 @@ ohos_fuzztest("DisableSuperAdminFuzzTest") { fuzz_config_file = "//base/customization/enterprise_device_management/test/fuzztest/disablesuperadmin_fuzzer" include_dirs = [ - "//commonlibrary/c_utils/base/include", "include", "include/utils", - "//commonlibrary/c_utils/base:utils_config", JSONCPP_INCLUDE_DIR, "$SUBSYSTEM_DIR/common/native/include", ] diff --git a/test/fuzztest/entinfo_fuzzer/BUILD.gn b/test/fuzztest/entinfo_fuzzer/BUILD.gn index e837f63131ff499687bd43f2506c9e2ad706c454..53d44257c78e4f4866f9d25062f8750bde1c3f34 100644 --- a/test/fuzztest/entinfo_fuzzer/BUILD.gn +++ b/test/fuzztest/entinfo_fuzzer/BUILD.gn @@ -27,10 +27,8 @@ ohos_fuzztest("EntInfoFuzzTest") { fuzz_config_file = "//base/customization/enterprise_device_management/test/fuzztest/entinfo_fuzzer" include_dirs = [ - "//commonlibrary/c_utils/base/include", "include", "include/utils", - "//commonlibrary/c_utils/base:utils_config", JSONCPP_INCLUDE_DIR, "$SUBSYSTEM_DIR/common/native/include", ] diff --git a/test/unittest/BUILD.gn b/test/unittest/BUILD.gn index ea4ee70a11e50c7d8e4027dc1fee9ed248ef4cf8..88e0f14e9c73fc7dfbf46552c4e264f994947617 100644 --- a/test/unittest/BUILD.gn +++ b/test/unittest/BUILD.gn @@ -27,11 +27,9 @@ ohos_unittest("EdmServicesUnitTest") { module_out_path = module_output_path include_dirs = [ - "//commonlibrary/c_utils/base/include", "//utils/system/safwk/native/include", "$EDM_ROOT/include", "$EDM_ROOT/include/utils", - "//commonlibrary/c_utils/base:utils_config", JSONCPP_INCLUDE_DIR, "./include", "$SUBSYSTEM_DIR/interfaces/inner_api/include",