modify gn format 0224

Signed-off-by: @chuangda_1 <fangwanning@huawei.com>
This commit is contained in:
@chuangda_1 2023-02-24 12:57:42 +08:00
parent 860ef61c82
commit b7cd3a32c0
9 changed files with 30 additions and 37 deletions

View File

@ -72,9 +72,3 @@ foundation/print_print_fwk #打印框架
系统打印管理应用
## 相关仓<a name="section1371113476307"></a>
元能力子系统
[**ability_runtime**](https://gitee.com/openharmony/ability_ability_runtime)

View File

@ -21,10 +21,10 @@ config("print_interfaces_kits_napi_config") {
}
ohos_shared_library("print_client") {
include_dirs = [
"//foundation/arkui/ace_engine/frameworks/base/utils",
"//foundation/arkui/napi",
"//foundation/arkui/napi/interfaces/kits",
"//foundation/arkui/napi/interfaces/inner_api",
"${arkui_path}/ace_engine/frameworks/base/utils",
"${arkui_path}/napi",
"${arkui_path}/napi/interfaces/kits",
"${arkui_path}/napi/interfaces/inner_api",
"//third_party/node/src",
"//third_party/curl/include",
"${ability_runtime_services_path}/common/include",
@ -35,7 +35,7 @@ ohos_shared_library("print_client") {
"${ability_runtime_inner_api_path}/ability_manager/include",
"//foundation/distributedschedule/samgr/interfaces/innerkits/Isamgr",
"//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include",
"${print_path}/utils/include",
"${print_utils_path}/include",
]
public_configs = [ ":print_interfaces_kits_napi_config" ]
@ -59,7 +59,7 @@ ohos_shared_library("print_client") {
"src/printer_info.cpp",
]
deps = [
"//foundation/arkui/napi:ace_napi",
"${arkui_path}/napi:ace_napi",
"//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
]
external_deps = [

View File

@ -21,7 +21,7 @@ config("ability_config") {
include_dirs = [
"${print_path}/frameworks/innerkitsimpl/include",
"${print_path}/frameworks/kits/extension/include",
"${print_path}/utils/include",
"${print_utils_path}/include",
"//commonlibrary/c_utils/base/include",
"${ability_runtime_path}/interfaces/kits/native/ability/native",
"${ability_runtime_path}/interfaces/kits/native/appkit/app",
@ -34,10 +34,10 @@ config("ability_config") {
"${ability_runtime_path}/interfaces/kits/native/appkit/app",
"${ability_runtime_services_path}/common/include",
"//foundation/systemabilitymgr/dmsfwk/services/dtbschedmgr/include",
"${system_ability_mgr_path}/dmsfwk/services/dtbschedmgr/include",
"//base/global/resource_management/interfaces/inner_api/include",
"${ability_runtime_napi_path}/featureAbility",
"//foundation/arkui/napi/interfaces/kits",
"${arkui_path}/napi/interfaces/kits",
"//third_party/node/src",
"//foundation/communication/ipc/interfaces/innerkits/ipc_core/include",
"${ability_runtime_path}/interfaces/kits/native/ability/native/continuation/remote_register_service",
@ -127,7 +127,7 @@ ohos_shared_library("print_extension_framework") {
"//base/global/i18n/frameworks/intl:intl_util",
"//base/global/resource_management/frameworks/resmgr:global_resmgr",
"//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog",
"//foundation/arkui/napi:ace_napi",
"${arkui_path}/napi:ace_napi",
]
subsystem_name = "print"

View File

@ -46,7 +46,7 @@ JsPrintExtension *JsPrintExtension::Create(const std::unique_ptr<Runtime> &runti
}
JsPrintExtension::JsPrintExtension(JsRuntime &jsRuntime) : jsRuntime_(jsRuntime),
extensionId_(""),hasDestroyed_(false) {}
extensionId_(""), hasDestroyed_(false) {}
JsPrintExtension::~JsPrintExtension() = default;
void JsPrintExtension::Init(const std::shared_ptr<AbilityLocalRecord> &record,

View File

@ -35,7 +35,7 @@ ohos_shared_library("print_napi") {
"${ability_runtime_inner_api_path}/ability_manager/include",
"//foundation/distributedschedule/samgr/interfaces/innerkits/Isamgr",
"//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include",
"${print_path}/utils/include",
"${print_utils_path}/include",
"${print_path}/frameworks/innerkitsimpl/include",
]
public_configs = [ ":print_interfaces_kits_napi_config" ]

View File

@ -12,15 +12,14 @@
# limitations under the License.
ability_runtime_path = "//foundation/ability/ability_runtime"
ability_runtime_inner_api_path = "${ability_runtime_path}/interfaces/inner_api"
ability_runtime_kits_path = "${ability_runtime_path}/frameworks/kits"
ability_runtime_napi_path = "${ability_runtime_path}/frameworks/js/napi"
ability_runtime_services_path = "${ability_runtime_path}/services"
print_path = "//base/print/print_fwk"
system_ability_mgr_path = "//foundation/systemabilitymgr"
utils_path = "${print_path}/utils"
arkui_path = "//foundation/arkui"
print_path = "//base/print/print_fwk"
print_utils_path = "${print_path}/utils"

View File

@ -43,7 +43,7 @@ ohos_shared_library("print_service") {
"//base/hiviewdfx/hisysevent/interfaces/native/innerkits/hisysevent/include",
"//base/hiviewdfx/hitrace/interfaces/native/innerkits/include/hitrace_meter",
"${print_path}/frameworks/innerkitsimpl/include",
"${print_path}/utils/include",
"${print_utils_path}/include",
]
deps = [
"${print_path}/frameworks/innerkitsimpl:print_client",

View File

@ -20,16 +20,16 @@ ohos_unittest("print_fwk_inner_napi_test") {
module_out_path = module_output_path
include_dirs = [
"${print_path}/frameworks/innerkitsimpl/include",
"//foundation/arkui/ace_engine/frameworks/base/utils",
"//foundation/arkui/napi",
"//foundation/arkui/napi/interfaces/kits",
"//foundation/arkui/napi/interfaces/inner_api",
"${arkui_path}/ace_engine/frameworks/base/utils",
"${arkui_path}/napi",
"${arkui_path}/napi/interfaces/kits",
"${arkui_path}/napi/interfaces/inner_api",
"//third_party/node/src",
"//third_party/curl/include",
"//utils/system/safwk/native/include",
"//foundation/distributedschedule/samgr/interfaces/innerkits/Isamgr",
"//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include",
"${print_path}/utils/include",
"${print_utils_path}/include",
]
sources = [
@ -51,8 +51,8 @@ ohos_unittest("print_fwk_inner_napi_test") {
"${print_path}/interfaces/kits/napi:print_napi",
"${print_path}/profile:print_sa_profiles",
"${print_path}/services:print_service",
"//foundation/arkui/napi:ace_napi",
"//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
"${arkui_path}/napi:ace_napi",
"${system_ability_mgr_path}/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
"//third_party/googletest:gmock_main",
"//third_party/googletest:gtest_main",
"//third_party/zlib:libz",

View File

@ -50,7 +50,7 @@ HWTEST_F(PrintJobTest, PrintJobTest_0001, TestSize.Level1)
std::vector<uint32_t> getFdList;
job.SetFdList(fdList);
job.GetFdList(getFdList);
EXPECT_EQ("file1", getFdList[0]);
EXPECT_EQ(1, getFdList[0]);
}
/**
@ -66,7 +66,7 @@ HWTEST_F(PrintJobTest, PrintJobTest_0002, TestSize.Level1)
std::vector<uint32_t> getFdList;
job.SetFdList(fdList);
job.GetFdList(getFdList);
EXPECT_EQ("file2", getFdList[1]);
EXPECT_EQ(2, getFdList[1]);
}
/**
@ -82,7 +82,7 @@ HWTEST_F(PrintJobTest, PrintJobTest_0003, TestSize.Level1)
std::vector<uint32_t> getFdList;
job.SetFdList(fdList);
job.GetFdList(getFdList);
EXPECT_EQ("file3", getFdList[2]);
EXPECT_EQ(3, getFdList[2]);
}
/**
@ -98,7 +98,7 @@ HWTEST_F(PrintJobTest, PrintJobTest_0004, TestSize.Level1)
std::vector<uint32_t> getFdList;
job.SetFdList(fdList);
job.GetFdList(getFdList);
EXPECT_EQ("file4", getFdList[3]);
EXPECT_EQ(4, getFdList[3]);
}
/**
@ -666,7 +666,7 @@ HWTEST_F(PrintJobTest, PrintJobTest_0046, TestSize.Level1)
OHOS::Print::PrintPreviewAttribute preview, getPreview;
job.SetPreview(preview);
job.GetPreview(getPreview);
EXPECT_EQ("", getPreview.GetResult());
EXPECT_EQ(0xFFFFFFFF, getPreview.GetResult());
}
/**