回退 'Pull Request !1372 : 文件名及路径可见性修复'

common/interface/BUILD.gn

@@ -29,10 +29,6 @@ config("accessibility_interface_private_config") {
   if (target_cpu == "arm") {
     cflags = [ "-DBINDER_IPC_32BIT" ]
   }
-
-  if (build_variant == "user") {
-    cflags += [ "-DRELEASE_VERSION" ]
-  }
 }
 
 config("accessibility_interface_public_config") {

common/log/include/hilog_wrapper.h

@@ -52,39 +52,23 @@
 #undef LOG_LABEL
 #endif
 
-#ifndef RELEASE_VERSION
+#define FILENAME (__builtin_strrchr(__FILE__, '/') ? __builtin_strrchr(__FILE__, '/') + 1 : __FILE__)
+
 #define HILOG_FATAL(fmt, ...)            \
     ((void)HILOG_IMPL(LOG_CORE, LOG_FATAL, AAMS_LOG_DOMAIN, AAMS_LOG_TAG, \
-    "[%{public}s(%{public}s:%{public}d)]" fmt, __FILE_NAME__, __FUNCTION__, __LINE__, ##__VA_ARGS__))
+    "[%{public}s(%{public}s:%{public}d)]" fmt, FILENAME, __FUNCTION__, __LINE__, ##__VA_ARGS__))
 #define HILOG_ERROR(fmt, ...)            \
     ((void)HILOG_IMPL(LOG_CORE, LOG_ERROR, AAMS_LOG_DOMAIN, AAMS_LOG_TAG, \
-    "[%{public}s(%{public}s:%{public}d)]" fmt, __FILE_NAME__, __FUNCTION__, __LINE__, ##__VA_ARGS__))
+    "[%{public}s(%{public}s:%{public}d)]" fmt, FILENAME, __FUNCTION__, __LINE__, ##__VA_ARGS__))
 #define HILOG_WARN(fmt, ...)            \
     ((void)HILOG_IMPL(LOG_CORE, LOG_WARN, AAMS_LOG_DOMAIN, AAMS_LOG_TAG, \
-    "[%{public}s(%{public}s:%{public}d)]" fmt, __FILE_NAME__, __FUNCTION__, __LINE__, ##__VA_ARGS__))
+    "[%{public}s(%{public}s:%{public}d)]" fmt, FILENAME, __FUNCTION__, __LINE__, ##__VA_ARGS__))
 #define HILOG_INFO(fmt, ...)            \
     ((void)HILOG_IMPL(LOG_CORE, LOG_INFO, AAMS_LOG_DOMAIN, AAMS_LOG_TAG, \
-    "[%{public}s(%{public}s:%{public}d)]" fmt, __FILE_NAME__, __FUNCTION__, __LINE__, ##__VA_ARGS__))
+    "[%{public}s(%{public}s:%{public}d)]" fmt, FILENAME, __FUNCTION__, __LINE__, ##__VA_ARGS__))
 #define HILOG_DEBUG(fmt, ...)            \
     ((void)HILOG_IMPL(LOG_CORE, LOG_DEBUG, AAMS_LOG_DOMAIN, AAMS_LOG_TAG, \
-    "[%{public}s(%{public}s:%{public}d)]" fmt, __FILE_NAME__, __FUNCTION__, __LINE__, ##__VA_ARGS__))
+    "[%{public}s(%{public}s:%{public}d)]" fmt, FILENAME, __FUNCTION__, __LINE__, ##__VA_ARGS__))
-#else // RELEASE_VERSION
-#define HILOG_FATAL(fmt, ...)            \
-    ((void)HILOG_IMPL(LOG_CORE, LOG_FATAL, AAMS_LOG_DOMAIN, AAMS_LOG_TAG, \
-    "[(%{public}s:%{public}d)]" fmt, __FUNCTION__, __LINE__, ##__VA_ARGS__))
-#define HILOG_ERROR(fmt, ...)            \
-    ((void)HILOG_IMPL(LOG_CORE, LOG_ERROR, AAMS_LOG_DOMAIN, AAMS_LOG_TAG, \
-    "[(%{public}s:%{public}d)]" fmt, __FUNCTION__, __LINE__, ##__VA_ARGS__))
-#define HILOG_WARN(fmt, ...)            \
-    ((void)HILOG_IMPL(LOG_CORE, LOG_WARN, AAMS_LOG_DOMAIN, AAMS_LOG_TAG, \
-    "[(%{public}s:%{public}d)]" fmt, __FUNCTION__, __LINE__, ##__VA_ARGS__))
-#define HILOG_INFO(fmt, ...)            \
-    ((void)HILOG_IMPL(LOG_CORE, LOG_INFO, AAMS_LOG_DOMAIN, AAMS_LOG_TAG, \
-    "[(%{public}s:%{public}d)]" fmt, __FUNCTION__, __LINE__, ##__VA_ARGS__))
-#define HILOG_DEBUG(fmt, ...)            \
-    ((void)HILOG_IMPL(LOG_CORE, LOG_DEBUG, AAMS_LOG_DOMAIN, AAMS_LOG_TAG, \
-    "[(%{public}s:%{public}d)]" fmt, __FUNCTION__, __LINE__, ##__VA_ARGS__))
-#endif // RELEASE_VERSION
 #else
 
 #define HILOG_FATAL(...)

interfaces/innerkits/aafwk/BUILD.gn

@@ -31,10 +31,6 @@ config("accessibleability_private_config") {
   ]
 
   defines += accessibility_default_defines
-
-  if (build_variant == "user") {
-    cflags += [ "-DRELEASE_VERSION" ]
-  }
 }
 
 config("accessibleability_public_config") {

interfaces/innerkits/acfwk/BUILD.gn

@@ -27,10 +27,6 @@ config("accessibilityconfig_private_config") {
     "AAMS_LOG_TAG = \"accessibility_acfwk\"",
     "AAMS_LOG_DOMAIN = 0xD001D03",
   ]
-
-  if (build_variant == "user") {
-    cflags += [ "-DRELEASE_VERSION" ]
-  }
 }
 
 config("accessibilityconfig_public_config") {

interfaces/innerkits/asacfwk/BUILD.gn

@@ -27,10 +27,6 @@ config("accessibilityclient_private_config") {
     "AAMS_LOG_TAG = \"accessibility_asacfwk\"",
     "AAMS_LOG_DOMAIN = 0xD001D02",
   ]
-
-  if (build_variant == "user") {
-    cflags += [ "-DRELEASE_VERSION" ]
-  }
 }
 
 config("accessibilityclient_public_config") {

interfaces/innerkits/common/BUILD.gn

@@ -24,10 +24,6 @@ config("accessibility_common_private_config") {
     "AAMS_LOG_TAG = \"accessibility_common\"",
     "AAMS_LOG_DOMAIN = 0xD001D04",
   ]
-
-  if (build_variant == "user") {
-    cflags += [ "-DRELEASE_VERSION" ]
-  }
 }
 
 config("accessibility_common_public_config") {

interfaces/kits/napi/BUILD.gn

@@ -35,10 +35,6 @@ ohos_shared_library("accessibility_napi") {
     "AAMS_LOG_DOMAIN = 0xD001D10",
   ]
 
-  if (build_variant == "user") {
-    cflags += [ "-DRELEASE_VERSION" ]
-  }
-
   sources = [
     "./src/napi_accessibility_event_info.cpp",
     "./src/napi_accessibility_system_ability_client.cpp",

interfaces/kits/napi/accessibility_config/BUILD.gn

@@ -35,10 +35,6 @@ ohos_shared_library("config_napi") {
     "AAMS_LOG_DOMAIN = 0xD001D10",
   ]
 
-  if (build_variant == "user") {
-    cflags += [ "-DRELEASE_VERSION" ]
-  }
-
   sources = [
     "./src/napi_accessibility_config.cpp",
     "./src/native_module.cpp",

interfaces/kits/napi/accessibility_extension_module_loader/BUILD.gn

@@ -27,10 +27,6 @@ config("accessibility_extension_module_config") {
     "AAMS_LOG_TAG = \"accessibility_napi\"",
     "AAMS_LOG_DOMAIN = 0xD001D10",
   ]
-
-  if (build_variant == "user") {
-    cflags += [ "-DRELEASE_VERSION" ]
-  }
 }
 
 ohos_shared_library("accessibility_extension_module") {

interfaces/kits/napi/accessibility_gesture_path/BUILD.gn

@@ -35,10 +35,6 @@ ohos_shared_library("gesturepath_napi") {
     "AAMS_LOG_DOMAIN = 0xD001D10",
   ]
 
-  if (build_variant == "user") {
-    cflags += [ "-DRELEASE_VERSION" ]
-  }
-
   sources = [
     "./src/napi_accessibility_gesture_path.cpp",
     "./src/native_module.cpp",

interfaces/kits/napi/accessibility_gesture_point/BUILD.gn

@@ -35,10 +35,6 @@ ohos_shared_library("gesturepoint_napi") {
     "AAMS_LOG_DOMAIN = 0xD001D10",
   ]
 
-  if (build_variant == "user") {
-    cflags += [ "-DRELEASE_VERSION" ]
-  }
-
   sources = [
     "./src/napi_accessibility_gesture_point.cpp",
     "./src/native_module.cpp",

services/aams/BUILD.gn

@@ -36,10 +36,6 @@ config("aams_service_config") {
     "AAMS_LOG_DOMAIN = 0xD001D00",
   ]
 
-  if (build_variant == "user") {
-    cflags += [ "-DRELEASE_VERSION" ]
-  }
-
   defines += accessibility_default_defines
 }