diff --git a/foundations/BUILD.gn b/foundations/BUILD.gn index 209453af75ecc3787c00a9876c7351d9f38d549a..e7fb032bb0e6cd4911ca8220728e5732155f4318 100644 --- a/foundations/BUILD.gn +++ b/foundations/BUILD.gn @@ -42,6 +42,16 @@ ohos_shared_library("update_foundations") { public_configs = [ ":update_service_foundations_config" ] + cflags = [ + "-fPIC", + "-Os", + "-Werror", + ] + + if (build_variant == "user") { + cflags += [ "-DIS_RELEASE_VERSION" ] + } + innerapi_tags = [ "platformsdk" ] part_name = "$updateengine_part_name" subsystem_name = "updater" diff --git a/foundations/ability/log/include/update_log.h b/foundations/ability/log/include/update_log.h index 3ca7e14bd0d0a0c0905054942f8121180c854a12..d6b66b366dd892c9bfdf2c07abfb21975c5666d5 100644 --- a/foundations/ability/log/include/update_log.h +++ b/foundations/ability/log/include/update_log.h @@ -96,7 +96,14 @@ private: static UpdateLogLevel level_; }; -#define R_FILENAME (__builtin_strrchr(__FILE__, '/') ? __builtin_strrchr(__FILE__, '/') + 1 : __FILE__) +#ifdef IS_RELEASE_VERSION +#define LOG_FILE_NAME "" +#else +#define LOG_FILE_NAME __FILE_NAME__ +#endif + +#define R_FILENAME (__builtin_strrchr(LOG_FILE_NAME, '/') ? __builtin_strrchr(LOG_FILE_NAME, '/') + 1 : \ + LOG_FILE_NAME) #define LONG_PRINT_HILOG(level, subtag, fmtlabel, fileName, line, fmt, ...) \ if (fmtlabel == PUBLIC_FMT_LABEL) { \ @@ -120,11 +127,11 @@ private: #define ENGINE_LOGD(fmt, ...) PRINT_LOGD(UPDATE_LOG_TAG_ID, fmt, ##__VA_ARGS__) #define PRINT_LONG_LOGD(subtag, label, fmt, args) UpdateLog::PrintLongLog(subtag, {label, \ - UpdateLogLevel::UPDATE_DEBUG, std::string(fmt), std::string(args), std::string(__FILE__), __LINE__}) + UpdateLogLevel::UPDATE_DEBUG, std::string(fmt), std::string(args), std::string(LOG_FILE_NAME), __LINE__}) #define PRINT_LONG_LOGI(subtag, label, fmt, args) UpdateLog::PrintLongLog(subtag, {label, \ - UpdateLogLevel::UPDATE_INFO, std::string(fmt), std::string(args), std::string(__FILE__), __LINE__}) + UpdateLogLevel::UPDATE_INFO, std::string(fmt), std::string(args), std::string(LOG_FILE_NAME), __LINE__}) #define PRINT_LONG_LOGE(subtag, label, fmt, args) UpdateLog::PrintLongLog(subtag, {label, \ - UpdateLogLevel::UPDATE_ERROR, std::string(fmt), std::string(args), std::string(__FILE__), __LINE__}) + UpdateLogLevel::UPDATE_ERROR, std::string(fmt), std::string(args), std::string(LOG_FILE_NAME), __LINE__}) #define ENGINE_LONG_LOGD(fmt, args) PRINT_LONG_LOGD(UPDATE_LOG_TAG_ID, UPDATE_LABEL[UPDATE_LOG_TAG_ID], fmt, args) #define ENGINE_LONG_LOGI(fmt, args) PRINT_LONG_LOGI(UPDATE_LOG_TAG_ID, UPDATE_LABEL[UPDATE_LOG_TAG_ID], fmt, args) diff --git a/frameworks/js/napi/update/BUILD.gn b/frameworks/js/napi/update/BUILD.gn index 0d7b70f12358afdb05e01e73c1982082e5d10715..6335aa10acf8783d8709dca39d54012bfc053642 100644 --- a/frameworks/js/napi/update/BUILD.gn +++ b/frameworks/js/napi/update/BUILD.gn @@ -67,4 +67,8 @@ ohos_shared_library("$updateengine_client_library_name") { "-Werror", "-DNAPI_VERSION=8", ] + + if (build_variant == "user") { + cflags += [ "-DIS_RELEASE_VERSION" ] + } } diff --git a/interfaces/inner_api/engine/BUILD.gn b/interfaces/inner_api/engine/BUILD.gn index 9dcd2bb1dc12069a9b5ab694a2bffcb5569cf05f..1dd1c4d249395316b81d600ddb4dd58525002fcb 100644 --- a/interfaces/inner_api/engine/BUILD.gn +++ b/interfaces/inner_api/engine/BUILD.gn @@ -81,6 +81,17 @@ ohos_shared_library("$updateengine_inner_library_name") { if (ability_ability_runtime_enable) { external_deps += [ "ability_runtime:extension_manager" ] } + + cflags = [ + "-fPIC", + "-Os", + "-Werror", + ] + + if (build_variant == "user") { + cflags += [ "-DIS_RELEASE_VERSION" ] + } + innerapi_tags = [ "platformsdk" ] part_name = "$updateengine_part_name" subsystem_name = "updater" diff --git a/interfaces/inner_api/modulemgr/BUILD.gn b/interfaces/inner_api/modulemgr/BUILD.gn index d145b344d32b8fb2af9da894127a790fd55ac1ac..9a4480fc1868b76c6c98625a1ee10e130aeeeab0 100644 --- a/interfaces/inner_api/modulemgr/BUILD.gn +++ b/interfaces/inner_api/modulemgr/BUILD.gn @@ -37,6 +37,11 @@ ohos_shared_library("update_module_mgr") { part_name = "$updateengine_part_name" subsystem_name = "updater" cflags = modulemgr_cflags + + if (build_variant == "user") { + cflags += [ "-DIS_RELEASE_VERSION" ] + } + innerapi_tags = [ "sasdk" ] public_configs = [ ":module_mgr_library_native_config" ] } diff --git a/services/engine/BUILD.gn b/services/engine/BUILD.gn index c88b23cfe3feb668aa9eb1b0740dd9205d2299d6..574b3315a79bde4afff68fe5755679e562c5a568 100644 --- a/services/engine/BUILD.gn +++ b/services/engine/BUILD.gn @@ -43,4 +43,8 @@ ohos_shared_library("$updateengine_library_name") { subsystem_name = "updater" defines = sa_defines cflags = sa_cflags + + if (build_variant == "user") { + cflags += [ "-DIS_RELEASE_VERSION" ] + } }