diff --git a/interfaces/innerkits/appexecfwk_base/BUILD.gn b/interfaces/innerkits/appexecfwk_base/BUILD.gn index 23b8ce35..9b235eed 100644 --- a/interfaces/innerkits/appexecfwk_base/BUILD.gn +++ b/interfaces/innerkits/appexecfwk_base/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/ohos.gni") -import("//foundation/appexecfwk/standard/appexecfwk.gni") +import("../../../appexecfwk.gni") config("appexecfwk_base_sdk_config") { include_dirs = [ @@ -47,7 +47,7 @@ ohos_shared_library("appexecfwk_base") { "src/module_info.cpp", "src/module_usage_record.cpp", "src/perf_profile.cpp", - "src/permission_def.cpp", + "src/permission_define.cpp", "src/remote_ability_info.cpp", "src/shortcut_info.cpp", ] diff --git a/interfaces/innerkits/appexecfwk_base/include/permission_def.h b/interfaces/innerkits/appexecfwk_base/include/permission_define.h similarity index 100% rename from interfaces/innerkits/appexecfwk_base/include/permission_def.h rename to interfaces/innerkits/appexecfwk_base/include/permission_define.h diff --git a/interfaces/innerkits/appexecfwk_base/src/permission_def.cpp b/interfaces/innerkits/appexecfwk_base/src/permission_define.cpp similarity index 98% rename from interfaces/innerkits/appexecfwk_base/src/permission_def.cpp rename to interfaces/innerkits/appexecfwk_base/src/permission_define.cpp index e2f1bac4..a9ac7033 100644 --- a/interfaces/innerkits/appexecfwk_base/src/permission_def.cpp +++ b/interfaces/innerkits/appexecfwk_base/src/permission_define.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ -#include "permission_def.h" +#include "permission_define.h" #include "nlohmann/json.hpp" #include "string_ex.h" diff --git a/interfaces/innerkits/appexecfwk_core/include/bundlemgr/bundle_mgr_interface.h b/interfaces/innerkits/appexecfwk_core/include/bundlemgr/bundle_mgr_interface.h index 313cc034..c30efb69 100644 --- a/interfaces/innerkits/appexecfwk_core/include/bundlemgr/bundle_mgr_interface.h +++ b/interfaces/innerkits/appexecfwk_core/include/bundlemgr/bundle_mgr_interface.h @@ -27,11 +27,11 @@ #include "common_event_info.h" #include "distributed_bundle_info.h" #include "form_info.h" -#include "foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base/include/permission_def.h" #include "hap_module_info.h" #include "module_usage_record.h" #include "on_permission_changed_callback_interface.h" #include "ohos/aafwk/content/want.h" +#include "permission_define.h" #ifdef BUNDLE_FRAMEWORK_GRAPHICS #include "pixel_map.h" #endif diff --git a/services/bundlemgr/BUILD.gn b/services/bundlemgr/BUILD.gn index f5b5dd7d..ad0e1ce2 100644 --- a/services/bundlemgr/BUILD.gn +++ b/services/bundlemgr/BUILD.gn @@ -12,9 +12,8 @@ # limitations under the License. import("//build/ohos.gni") -import("//foundation/appexecfwk/standard/appexecfwk.gni") -import( - "//foundation/appexecfwk/standard/services/bundlemgr/appexecfwk_bundlemgr.gni") +import("../../appexecfwk.gni") +import("appexecfwk_bundlemgr.gni") config("bundlemgr_common_config") { include_dirs = [ diff --git a/services/bundlemgr/include/bundle_permission_mgr.h b/services/bundlemgr/include/bundle_permission_mgr.h index deced6c7..8560964a 100644 --- a/services/bundlemgr/include/bundle_permission_mgr.h +++ b/services/bundlemgr/include/bundle_permission_mgr.h @@ -18,8 +18,8 @@ #include "accesstoken_kit.h" #include "bundle_constants.h" -#include "foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base/include/permission_def.h" #include "inner_bundle_info.h" +#include "permission_define.h" namespace OHOS { namespace AppExecFwk { diff --git a/services/bundlemgr/test/unittest/bms_bundle_accesstokenid_test/bms_bundle_accesstokenid_test.cpp b/services/bundlemgr/test/unittest/bms_bundle_accesstokenid_test/bms_bundle_accesstokenid_test.cpp index fbcded16..071e9297 100644 --- a/services/bundlemgr/test/unittest/bms_bundle_accesstokenid_test/bms_bundle_accesstokenid_test.cpp +++ b/services/bundlemgr/test/unittest/bms_bundle_accesstokenid_test/bms_bundle_accesstokenid_test.cpp @@ -23,11 +23,11 @@ #include "bundle_mgr_service.h" #include "bundle_permission_mgr.h" #include "bundle_verify_mgr.h" -#include "foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base/include/permission_def.h" #include "inner_bundle_info.h" #include "installd/installd_service.h" #include "installd_client.h" #include "mock_status_receiver.h" +#include "permission_define.h" using namespace testing::ext; using namespace std::chrono_literals; diff --git a/services/bundlemgr/test/unittest/bms_bundle_permission_grant_test/bms_bundle_permission_grant_test.cpp b/services/bundlemgr/test/unittest/bms_bundle_permission_grant_test/bms_bundle_permission_grant_test.cpp index 7ae06b96..0640bd1a 100644 --- a/services/bundlemgr/test/unittest/bms_bundle_permission_grant_test/bms_bundle_permission_grant_test.cpp +++ b/services/bundlemgr/test/unittest/bms_bundle_permission_grant_test/bms_bundle_permission_grant_test.cpp @@ -23,11 +23,11 @@ #include "bundle_mgr_service.h" #include "bundle_permission_mgr.h" #include "bundle_verify_mgr.h" -#include "foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base/include/permission_def.h" #include "inner_bundle_info.h" #include "installd/installd_service.h" #include "installd_client.h" #include "mock_status_receiver.h" +#include "permission_define.h" using namespace testing::ext; using namespace std::chrono_literals; diff --git a/test/benchmarktest/permission_def_test/permission_def_test.cpp b/test/benchmarktest/permission_def_test/permission_def_test.cpp index 9e8a1a2f..c4fec46d 100644 --- a/test/benchmarktest/permission_def_test/permission_def_test.cpp +++ b/test/benchmarktest/permission_def_test/permission_def_test.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ -#include "permission_def.h" +#include "permission_define.h" #include