fix issues and update build.gn

Signed-off-by: huzhonghua <huzhonghua1@huawei.com>
This commit is contained in:
openharmony_ci
2021-06-30 11:03:57 +00:00
committed by huzhonghua
4 changed files with 28 additions and 1 deletions
+5
View File
@@ -222,6 +222,11 @@ static int32_t IpcServiceGmCreateGroup(const IpcDataInfo *ipcParams, int32_t par
LOGE("get param error, type %d", PARAM_TYPE_CREATE_PARAMS);
return ret;
}
ret = AddReqIdByAppId(appId, requestId);
if (ret != HC_SUCCESS) {
LOGE("bind request id by app id failed");
return ret;
}
callRet = g_devGroupMgrMethod.createGroup(requestId, appId, createParams);
ret = IpcEncodeCallReplay(outCache, PARAM_TYPE_IPC_RESULT, (const uint8_t *)&callRet, sizeof(int32_t));
+2
View File
@@ -33,6 +33,7 @@ ohos_static_library("deviceauth_hal_linux") {
"//utils/native/base/include",
"//third_party/openssl/include/",
"//base/security/huks/interfaces/innerkits/huks_standard/main/include",
"//base/startup/syspara_lite/interfaces/innerkits/native/syspara/include"
]
sources = hal_common_files
@@ -56,6 +57,7 @@ ohos_static_library("deviceauth_hal_linux") {
"//third_party/cJSON:cjson_static",
"//third_party/openssl:libcrypto_static",
"//utils/native/base:utils",
"//base/startup/syspara_lite/interfaces/innerkits/native/syspara:syspara"
]
external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
+8 -1
View File
@@ -15,7 +15,9 @@
#include "hc_dev_info.h"
#include "hc_error.h"
#include "hc_log.h"
#include "securec.h"
#include "parameter.h"
#ifdef __cplusplus
extern "C" {
@@ -26,6 +28,11 @@ int32_t HcGetUdid(uint8_t *udid, int32_t udidLen)
if (udid == NULL || udidLen < INPUT_UDID_LEN || udidLen > MAX_INPUT_UDID_LEN) {
return HAL_ERR_INVALID_PARAM;
}
int32_t ret = GetDevUdid((char *)udid, udidLen);
if (ret == 0) {
return HAL_SUCCESS;
}
LOGW("using fake udid");
const char *udidTemp = "ABCDEF00ABCDEF00ABCDEF00ABCDEF00ABCDEF00ABCDEF00ABCDEF00ABCDEF00";
(void)memset_s(udid, udidLen, 0, udidLen);
if (memcpy_s(udid, udidLen, udidTemp, strlen(udidTemp)) != EOK) {
@@ -41,4 +48,4 @@ const char *GetStoragePath()
#ifdef __cplusplus
}
#endif
#endif
+13
View File
@@ -11,6 +11,19 @@
"//base/security/deviceauth:deviceauth_service_build",
"//base/security/deviceauth:deviceauth_sdk_build"
],
"inner_kits": [
{
"type": "so",
"name": "//base/security/deviceauth/services:deviceauth_sdk",
"header": {
"header_files": [
"device_auth_defines.h",
"device_auth.h"
],
"header_base": "//base/security/deviceauth/interfaces/innerkits"
}
}
],
"test_list": [
"//base/security/deviceauth:deviceauth_test_build"
]