independent compile

Signed-off-by: y30053096 <yangjinhuan@huawei.com>

Change-Id: Iccfffa5b1a707209d66a9ca6ddbd79182e96b0e0
This commit is contained in:
y30053096 2024-03-21 19:13:08 +08:00
parent 7ec32b211f
commit 3b167459d7
6 changed files with 15 additions and 33 deletions

View File

@ -57,10 +57,6 @@
"bounds_checking_function",
"mbedtls",
"cJSON"
],
"third_party": [
"bounds_checking_function",
"mbedtls"
]
},
"build": {

View File

@ -32,21 +32,16 @@ ohos_shared_library("cipher_shared") {
sources += [ "src/cipher_log.c" ]
}
include_dirs = [
"include",
"//third_party/bounds_checking_function/include",
]
deps = [
"//third_party/bounds_checking_function:libsec_shared",
"//third_party/mbedtls",
include_dirs = [ "include" ]
external_deps = [
"bounds_checking_function:libsec_shared",
"mbedtls:mbedtls_shared",
]
if (os_level == "small") {
external_deps = [ "hilog_lite:hilog_shared" ]
external_deps += [ "hilog_lite:hilog_shared" ]
} else if (os_level == "standard") {
external_deps = [ "hilog:libhilog" ]
include_dirs +=
[ "//base/hiviewdfx/hilog/interfaces/native/innerkits/include" ]
external_deps += [ "hilog:libhilog" ]
}
cflags = [

View File

@ -25,17 +25,16 @@ ohos_shared_library("cipher_napi") {
sources = [ "cipher_napi.cpp" ]
include_dirs = [
"//third_party/bounds_checking_function/include",
"//base/security/huks/frameworks/crypto_lite/cipher/include",
"//base/hiviewdfx/hilog/interfaces/native/innerkits//include",
"log",
]
deps = [
"//base/security/huks/frameworks/crypto_lite/cipher:cipher_shared",
"//third_party/bounds_checking_function:libsec_shared",
]
deps = [ "//base/security/huks/frameworks/crypto_lite/cipher:cipher_shared" ]
external_deps = [ "napi:ace_napi" ]
external_deps = [
"bounds_checking_function:libsec_shared",
"hilog:libhilog",
"napi:ace_napi",
]
cflags_cc = [
"-Wall",

View File

@ -17,10 +17,7 @@ import("//build/ohos.gni")
if (os_level == "standard") {
config("huks_config") {
include_dirs = [
"service",
"//foundation/bundlemanager/bundle_framework/interfaces/inner_api/appexecfwk_base/include",
]
include_dirs = [ "service" ]
}
ohos_static_library("libhuks_service_os_dependency_standard_static") {
subsystem_name = "security"

View File

@ -15,7 +15,6 @@
#include "hks_event_observer.h"
#include "bundle_constants.h"
#include "common_event_support.h"
#ifdef HAS_OS_ACCOUNT_PART
#include "os_account_manager.h"
@ -93,10 +92,11 @@ void SystemEventSubscriber::OnReceiveEvent(const OHOS::EventFwk::CommonEventData
struct HksProcessInfo processInfo = { { 0, nullptr }, { 0, nullptr } };
auto want = data.GetWant();
constexpr const char* UID = "uid";
std::string action = want.GetAction();
if (action == OHOS::EventFwk::CommonEventSupport::COMMON_EVENT_PACKAGE_REMOVED ||
action == OHOS::EventFwk::CommonEventSupport::COMMON_EVENT_SANDBOX_PACKAGE_REMOVED) {
int uid = want.GetIntParam(AppExecFwk::Constants::UID, -1);
int uid = want.GetIntParam(UID, -1);
int userId = -1;
#ifdef HAS_OS_ACCOUNT_PART
OHOS::AccountSA::OsAccountManager::GetOsAccountLocalIdFromUid(uid, userId);

View File

@ -29,8 +29,6 @@ config("public_huks_config") {
"//base/security/huks/frameworks/huks_standard/main/core/include",
"//base/security/huks/frameworks/huks_standard/main/os_dependency/sysinfo/include",
"//base/security/huks/services/huks_standard/huks_service/main/core/include",
"//commonlibrary/utils_lite/memory/include/",
"//commonlibrary/utils_lite/include/",
"//base/security/huks/services/huks_standard/huks_service/main/os_dependency/idl/passthrough",
"//base/security/huks/utils/crypto_adapter",
"//base/security/huks/services/huks_standard/huks_service/main/systemapi_wrap/useridm/inc",
@ -39,7 +37,6 @@ config("public_huks_config") {
"//base/security/huks/services/huks_standard/huks_engine/main/core_dependency/include",
"//base/security/huks/services/huks_standard/huks_service/main/systemapi_wrap/hisysevent_wrapper/include",
"//base/security/huks/services/huks_standard/huks_service/main/os_dependency/sa",
"//foundation/bundlemanager/bundle_framework/interfaces/inner_api/appexecfwk_base/include",
]
if (huks_use_rkc_in_standard) {
include_dirs += [ "//base/security/huks/frameworks/huks_standard/main/crypto_engine/rkc/include" ]
@ -151,8 +148,6 @@ ohos_static_library("libhukssdk_static") {
"//base/security/huks/frameworks/huks_standard/main/core/include",
"//base/security/huks/frameworks/huks_standard/main/os_dependency/sysinfo/include",
"//base/security/huks/services/huks_standard/huks_service/main/core/include",
"//commonlibrary/utils_lite/memory/include/",
"//commonlibrary/utils_lite/include/",
"//base/security/huks/services/huks_standard/huks_service/main/os_dependency/idl/passthrough",
"//base/security/huks/utils/crypto_adapter",