!105 hilog 发布版本删除文件路径打印

Merge pull request !105 from WoHoo/master

frameworks/common/BUILD.gn

@@ -65,6 +65,10 @@ ohos_shared_library("app_domain_verify_frameworks_common") {
     "safwk:system_ability_fwk",
     "samgr:samgr_proxy",
   ]
+  defines = []
+  if (build_variant == "user") {
+    defines += [ "IS_RELEASE_VERSION" ]
+  }
   sanitize = {
     cfi = true
     cfi_cross_dso = true

frameworks/common/include/app_domain_verify_hilog.h

@@ -45,18 +45,28 @@ static constexpr const char* APP_DOMAIN_VERIFY_MODULE_LABEL[APP_DOMAIN_VERIFY_MO
     "ADVComm",
     "ADVButt",
 };
+#ifdef IS_RELEASE_VERSION
+#ifndef APP_DOMAIN_VERIFY_FUNC_FMT
+#define APP_DOMAIN_VERIFY_FUNC_FMT "[(%{public}s:%{public}d)]"
+#endif
 
+#ifndef APP_DOMAIN_VERIFY_FUNC_INFO
+#define APP_DOMAIN_VERIFY_FUNC_INFO __FUNCTION__, __LINE__
+#endif
+#else  // IS_RELEASE_VERSION
 #ifndef APP_DOMAIN_VERIFY_FUNC_FMT
 #define APP_DOMAIN_VERIFY_FUNC_FMT "[%{public}s(%{public}s:%{public}d)]"
 #endif
 
 #ifndef APP_DOMAIN_VERIFY_FILE_NAME
-#define APP_DOMAIN_VERIFY_FILE_NAME (__builtin_strrchr(__FILE__, '/') ? __builtin_strrchr(__FILE__, '/') + 1 : __FILE__)
+#define APP_DOMAIN_VERIFY_FILE_NAME \
+    (__builtin_strrchr(__FILE_NAME__, '/') ? __builtin_strrchr(__FILE_NAME__, '/') + 1 : __FILE_NAME__)
 #endif
 
 #ifndef APP_DOMAIN_VERIFY_FUNC_INFO
 #define APP_DOMAIN_VERIFY_FUNC_INFO APP_DOMAIN_VERIFY_FILE_NAME, __FUNCTION__, __LINE__
 #endif
+#endif  // IS_RELEASE_VERSION
 
 #define APP_DOMAIN_VERIFY_PRINT_LOG(level, label, fmt, ...)                                                \
     ((void)HILOG_IMPL(LOG_CORE, level, APP_DOMAIN_VERIFY_DOMAIN_ID, APP_DOMAIN_VERIFY_MODULE_LABEL[label], \
@@ -67,6 +77,7 @@ static constexpr const char* APP_DOMAIN_VERIFY_MODULE_LABEL[APP_DOMAIN_VERIFY_MO
 #define APP_DOMAIN_VERIFY_HILOGW(label, fmt, ...) APP_DOMAIN_VERIFY_PRINT_LOG(LOG_WARN, label, fmt, ##__VA_ARGS__)
 #define APP_DOMAIN_VERIFY_HILOGE(label, fmt, ...) APP_DOMAIN_VERIFY_PRINT_LOG(LOG_ERROR, label, fmt, ##__VA_ARGS__)
 #define APP_DOMAIN_VERIFY_HILOGF(label, fmt, ...) APP_DOMAIN_VERIFY_PRINT_LOG(LOG_FATAL, label, fmt, ##__VA_ARGS__)
+
 }  // namespace AppDomainVerify
 }  // namespace OHOS
 

frameworks/extension/BUILD.gn

@@ -61,6 +61,10 @@ ohos_shared_library("app_domain_verify_extension_framework") {
     "ipc:ipc_single",
     "samgr:samgr_proxy",
   ]
+  defines = []
+  if (build_variant == "user") {
+    defines += [ "IS_RELEASE_VERSION" ]
+  }
   sanitize = {
     cfi = true
     cfi_cross_dso = true

frameworks/verifier/BUILD.gn

@@ -45,7 +45,6 @@ ohos_shared_library("app_domain_verify_agent_verifier") {
     "src/verify_task.cpp",
   ]
   public_configs = [ ":app_domain_verify_agent_verifier_config" ]
-  defines = [ "API_EXPORT=__attribute__((visibility (\"default\")))" ]
   deps = [
     "${app_domain_verify_client_path}:app_domain_verify_mgr_client",
     "${app_domain_verify_common_path}:app_domain_verify_common",
@@ -72,6 +71,10 @@ ohos_shared_library("app_domain_verify_agent_verifier") {
     "safwk:system_ability_fwk",
     "samgr:samgr_proxy",
   ]
+  defines = []
+  if (build_variant == "user") {
+    defines += [ "IS_RELEASE_VERSION" ]
+  }
   sanitize = {
     cfi = true
     cfi_cross_dso = true

interfaces/inner_api/client/BUILD.gn

@@ -75,6 +75,10 @@ ohos_shared_library("app_domain_verify_mgr_client") {
     "ipc:ipc_core",
     "samgr:samgr_proxy",
   ]
+  defines = []
+  if (build_variant == "user") {
+    defines += [ "IS_RELEASE_VERSION" ]
+  }
   version_script = "mgr.versionscript"
   sanitize = {
     cfi = true
@@ -104,6 +108,10 @@ ohos_shared_library("app_domain_verify_agent_client") {
     "ipc:ipc_core",
     "samgr:samgr_proxy",
   ]
+  defines = []
+  if (build_variant == "user") {
+    defines += [ "IS_RELEASE_VERSION" ]
+  }
   sanitize = {
     cfi = true
     cfi_cross_dso = true

interfaces/inner_api/common/BUILD.gn

@@ -55,6 +55,10 @@ ohos_shared_library("app_domain_verify_common") {
     "safwk:system_ability_fwk",
     "samgr:samgr_proxy",
   ]
+  defines = []
+  if (build_variant == "user") {
+    defines += [ "IS_RELEASE_VERSION" ]
+  }
   sanitize = {
     cfi = true
     cfi_cross_dso = true

interfaces/kits/js/BUILD.gn

@@ -49,7 +49,6 @@ ohos_shared_library("appdomainverify_napi") {
     "${app_domain_verify_client_path}:app_domain_verify_mgr_client",
     "${app_domain_verify_common_path}:app_domain_verify_common",
   ]
-  defines = [ "API_EXPORT=__attribute__((visibility (\"default\")))" ]
   external_deps = [
     "ability_base:want",
     "bundle_framework:appexecfwk_base",
@@ -61,6 +60,10 @@ ohos_shared_library("appdomainverify_napi") {
     "safwk:system_ability_fwk",
     "samgr:samgr_proxy",
   ]
+  defines = []
+  if (build_variant == "user") {
+    defines += [ "IS_RELEASE_VERSION" ]
+  }
 
   relative_install_dir = "module/bundle"
   subsystem_name = "bundlemanager"

services/BUILD.gn

@@ -66,6 +66,9 @@ ohos_shared_library("app_domain_verify_mgr_service") {
     "${app_domain_verify_common_path}:app_domain_verify_common",
   ]
   defines = [ "API_EXPORT=__attribute__((visibility (\"default\")))" ]
+  if (build_variant == "user") {
+    defines += [ "IS_RELEASE_VERSION" ]
+  }
   external_deps = [
     "ability_base:base",
     "ability_base:want",
@@ -87,6 +90,7 @@ ohos_shared_library("app_domain_verify_mgr_service") {
     "safwk:system_ability_fwk",
     "samgr:samgr_proxy",
   ]
+
   sanitize = {
     cfi = true
     cfi_cross_dso = true
@@ -139,6 +143,9 @@ ohos_shared_library("app_domain_verify_agent_service") {
   ]
   public_configs = [ ":app_domain_verify_agent_service_config" ]
   defines = [ "API_EXPORT=__attribute__((visibility (\"default\")))" ]
+  if (build_variant == "user") {
+    defines += [ "IS_RELEASE_VERSION" ]
+  }
   deps = [
     "${app_domain_verify_client_path}:app_domain_verify_mgr_client",
     "${app_domain_verify_common_path}:app_domain_verify_common",
@@ -169,6 +176,7 @@ ohos_shared_library("app_domain_verify_agent_service") {
     "safwk:system_ability_fwk",
     "samgr:samgr_proxy",
   ]
+
   sanitize = {
     cfi = true
     cfi_cross_dso = true