fix compile error

Change-Id: I06e74d1e81234a422297ae92a3e7e52ee5f6ec28 Match-id-19125028469ac969568a82db4035e6a9a1c5c438
2025-02-20 00:14:10 +00:00 · 2023-11-10 13:01:17 +08:00 · 2023-11-10 13:01:17 +08:00 · aa657e9b15
commit aa657e9b15
parent 652d038bf3
6 changed files with 36 additions and 22 deletions
--- a/BUILD.gn
+++ b/BUILD.gn
@ -33,6 +33,6 @@ group("asset_bin_test") {
    "services/db_operator:asset_db_operator_test",
    "test/unittest/inner_api_rust:asset_rust_test",
    "test/unittest/kits_ndk:asset_ndk_test",
-    "test/unittest/module_test:asset_module_test",
+    # "test/unittest/module_test:asset_module_test", # todo
  ]
 }
--- a/README.md
+++ b/README.md
@ -7,6 +7,7 @@ mkdir hmos_trunk
 cd hmos_trunk
 repo init -u http://mgit-tm.rnd.huawei.com/platform/manifest -m system_general.xml -b hmos_trunk --repo-branch=stable --no-repo-verify --repo-branch=stable_py3
 repo sync -c -j32
+./build/prebuilts_download.sh --skip-ssl --tool-repo=http://hmf.inhuawei.com:9080 --npm-registry=http://mirrors.tools.huawei.com/npm/ --pypi-url=http://mirrors.tools.huawei.com/pypi/simple/
 ```

 2. asset代码下载：
@ -17,61 +18,70 @@ git clone ssh://git@szv-y.codehub.huawei.com:2222/y00522150/asset.git
 ```

 ## 编译运行
-在vendor/huawei/build/component_config/system/generic_generic_arm_64only/hisi_higeneric/newphone_standard/part_config.json添加
-"security:asset":{},
-
-在vendor/huawei/build/component_config/system/generic_generic_arm_64only/hisi_newbaltimore/pc_standard/part_config.json添加
-"security:asset":{},
-
 ```bash
+# 运行前配置
+cd vendor/huawei/build
+git fetch https://szv-cr-y.codehub.huawei.com/CBG_CR_HarmonyOS/huawei/build.git refs/change-requests/1032/1 && git cherry-pick FETCH_HEAD
+cd -
+cd third_party/sqlite
+git fetch https://szv-open.codehub.huawei.com/OpenSourceCenter_CR/openharmony/third_party_sqlite.git refs/change-requests/12/2 && git cherry-pick FETCH_HEAD
+cd -
+cd base/security/huks
+git fetch https://szv-open.codehub.huawei.com/OpenSourceCenter_CR/openharmony/security_huks.git refs/change-requests/67/2 && git cherry-pick FETCH_HEAD
+git fetch https://szv-open.codehub.huawei.com/OpenSourceCenter_CR/openharmony/security_huks.git refs/change-requests/59/2 && git cherry-pick FETCH_HEAD
+cd -
+
 # 首次编译命令：（修改BUILD.gn时执行）
-./build_system.sh --abi-type generic_generic_arm_64only --device-type hisi_higeneric_newphone_standard --ccache --build-variant root --build-target out/generic_generic_arm_64only/hisi_higeneric_newphone_standard/build_configs/security/asset:asset --build-target asset_test
+./build_system.sh --abi-type generic_generic_arm_64only --device-type hisi_all_phone_standard --ccache --build-variant root --build-target asset --build-target asset_test

 # 非首次编译命令：（未修改BUILD.gn时执行）
-./build_system.sh --abi-type generic_generic_arm_64only --device-type hisi_higeneric_newphone_standard --ccache --build-variant root --build-target out/generic_generic_arm_64only/hisi_higeneric_newphone_standard/build_configs/security/asset:asset --build-target asset_test --fast-rebuild
+./build_system.sh --abi-type generic_generic_arm_64only --device-type hisi_all_phone_standard --ccache --build-variant root --build-target asset --build-target asset_test --fast-rebuild

 # 打点文件编译命令：（修改hisysevent.yaml时执行）
 ./build/ohos/hisysevent/gen_def_from_all_yaml.py --yaml-list base/security/asset/hisysevent.yaml --def-path out/generic_generic_arm_64only/hisi_higeneric_newphone_standard/security/asset

-# PC编译命令：
-./build_system.sh --abi-type generic_generic_arm_64only --device-type hisi_newbaltimore_pc_standard --ccache --build-variant root --build-target out/generic_generic_arm_64only/hisi_newbaltimore_pc_standard/build_configs/security/asset:asset --build-target asset_test
-
 # 支持SA自启：(仅在调试设备上执行一次)
 ./scripts/push_asset_cfg.bat

 # 运行环境：(每次代码修改后执行)
 ./scripts/push_asset.bat

-# 批量整改gn文件格式（在asset目录下执行）
-find -name "*.gn" | xargs ../../../prebuilts/build-tools/linux-x86/bin/gn format
+
 ```

 ## 测试
 测试DEMO：https://codehub-y.huawei.com/y00522150/AssetDemo/files?ref=master
+测试Sample: https://codehub-y.huawei.com/z00639827/asset_sample/files?ref=master

 ```bash
 # 自动化用例推包运行
-hdc file send Z:\workspace\hmos_trunk\out\generic_generic_arm_64only\hisi_higeneric_newphone_standard\tests\unittest\asset\asset_UT_test\asset_rust_test ./data/
+hdc file send Z:\workspace\hmos_trunk\out\generic_generic_arm_64only\hisi_all_phone_standard\tests\unittest\asset\asset_UT_test\asset_rust_test ./data/
+hdc file send Z:\workspace\hmos_trunk\out\generic_generic_arm_64only\hisi_all_phone_standard\tests\unittest\asset\asset_UT_test\asset_ndk_test ./data/
+hdc file send Z:\workspace\hmos_trunk\out\generic_generic_arm_64only\hisi_all_phone_standard\tests\unittest\asset\asset_UT_test\asset_module_test ./data/

 hdc shell chmod 777 ./data/asset_rust_test
+hdc shell chmod 777 ./data/asset_ndk_test
+hdc shell chmod 777 ./data/asset_module_test

 hdc shell "./data/asset_rust_test --test-threads=1"
-
-hdc file send Z:\workspace\hmos_trunk\out\generic_generic_arm_64only\hisi_higeneric_newphone_standard\tests\unittest\asset\asset_UT_test\asset_ndk_test ./data/
-
-hdc shell chmod 777 ./data/asset_ndk_test
-
 hdc shell "./data/asset_ndk_test --gtest_output=xml:/data/"
+hdc shell "./data/asset_module_test --test-threads=1"
 ```

-# 单线程运行测试用例
+### 单线程运行测试用例
 执行的时候 在后面加 --test-threads=1

 ## 工具汇总
 ```bash
-# 格式化BUILD.gn文件, 在asset目录下执行
+# 格式化BUILD.gn文件（在asset目录下执行）
 find -name "*.gn" -or -name "*.gni" | xargs ../../../prebuilts/build-tools/linux-x86/bin/gn format

+# 批量整改gn文件格式（在asset目录下执行）
+find -name "*.gn" | xargs ../../../prebuilts/build-tools/linux-x86/bin/gn format
+
+# 代码格式化（在asset目录下执行）
+cargo fmt
+
 # disable样机打卡软件, 在设备上执行
 hdc shell
 find -name com.huawei.hmsapp.samplemanagement | xargs rm -rf
--- a/interfaces/inner_api/rs/BUILD.gn
+++ b/interfaces/inner_api/rs/BUILD.gn
@ -24,6 +24,7 @@ ohos_rust_shared_library("asset_sdk") {

  external_deps = [
    "c_utils:utils",
+    "hilog:libhilog",
    "ipc:ipc_rust",
    "samgr:rust_samgr",
  ]
--- a/services/core_service/BUILD.gn
+++ b/services/core_service/BUILD.gn
@ -29,6 +29,7 @@ ohos_rust_shared_library("asset_service") {

  external_deps = [
    "hilog:hilog_rust",
+    "hilog:libhilog",
    "hisysevent:hisysevent_rust",
    "hitrace:hitrace_meter_rust",
    "ipc:ipc_rust",
--- a/services/os_dependency/BUILD.gn
+++ b/services/os_dependency/BUILD.gn
@ -50,6 +50,7 @@ ohos_rust_shared_ffi("asset_service_ffi") {
    "../crypto_manager:asset_crypto_manager",
    "../db_operator:asset_db_operator",
  ]
+  external_deps = [ "hilog:libhilog" ]
  crate_name = "asset_service_ffi"
  subsystem_name = "security"
  part_name = "asset"
--- a/test/unittest/module_test/BUILD.gn
+++ b/test/unittest/module_test/BUILD.gn
@ -22,6 +22,7 @@ ohos_rust_unittest("asset_module_test") {
    "../../../frameworks/definition:asset_definition",
    "../../../services/crypto_manager:asset_crypto_manager",
  ]
+  external_deps = [ "hilog:libhilog" ]
  module_out_path = module_output_path
  subsystem_name = "security"
  part_name = "asset"