diff --git a/devicemanager.gni b/devicemanager.gni index fee9560c8149ab41407bb655dddd55a3e4cbe786..cd0c8112e2a66f1a735ad0ab3ed937fd093a718e 100644 --- a/devicemanager.gni +++ b/devicemanager.gni @@ -20,5 +20,3 @@ utils_path = "${devicemanager_path}/utils" services_path = "${devicemanager_path}/services" innerkits_path = "${devicemanager_path}/interfaces/inner_kits" - -build_flags = [ "-Werror" ] diff --git a/interfaces/inner_kits/native_cpp/BUILD.gn b/interfaces/inner_kits/native_cpp/BUILD.gn index 0c67c13c6baf0c64e495a12ea0a60ae08dd17d7e..154927025c2b68a61c2e1030a4e05f84d382c081 100644 --- a/interfaces/inner_kits/native_cpp/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/BUILD.gn @@ -58,8 +58,6 @@ if (defined(ohos_lite)) { "LOG_DOMAIN=0xD004100", ] - cflags_cc = build_flags - deps = [ "${utils_path}:devicemanagerutils", "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", diff --git a/services/devicemanagerservice/BUILD.gn b/services/devicemanagerservice/BUILD.gn index aa7dc489ff6e42a34d19b1d49283d42a6ebab2e6..0e8f974ea14374ae8e7079737040ae5e81cce07e 100644 --- a/services/devicemanagerservice/BUILD.gn +++ b/services/devicemanagerservice/BUILD.gn @@ -89,8 +89,6 @@ if (defined(ohos_lite)) { "LOG_DOMAIN=0xD004100", ] - cflags_cc = build_flags - deps = [ "${innerkits_path}/native_cpp:devicemanagersdk", "${utils_path}:devicemanagerutils", diff --git a/services/devicemanagerservice/include/softbus/softbus_session.h b/services/devicemanagerservice/include/softbus/softbus_session.h index 002a780d01cc1a694f16668fba3305569a8c0331..03610be2cbcb6df81248044d040f0448a3dc98b4 100644 --- a/services/devicemanagerservice/include/softbus/softbus_session.h +++ b/services/devicemanagerservice/include/softbus/softbus_session.h @@ -43,8 +43,8 @@ private: private: int32_t SendData(int32_t sessionId, const void *data, int32_t len); private: - const char *PKG_NAME = "com.ohos.devicemanager"; - const char *SESSION_NAME = "com.ohos.devicemanager.resident"; + const char *PKG_NAME = "ohos.distributedhardware.devicemanager"; + const char *SESSION_NAME = "ohos.distributedhardware.devicemanager.resident"; std::set sessionIdSet_; std::vector messages_ {}; }; diff --git a/services/devicemanagerservice/src/auth/hichain_connector.cpp b/services/devicemanagerservice/src/auth/hichain_connector.cpp index 435f68061850a85d5c566f1d502677367b67ba90..d0e868e053a884af32bcc1e1de34e5b97c2930b8 100644 --- a/services/devicemanagerservice/src/auth/hichain_connector.cpp +++ b/services/devicemanagerservice/src/auth/hichain_connector.cpp @@ -46,7 +46,7 @@ const std::string BR_MAC = "BR_MAC"; const std::string BLE_MAC = "BLE_MAC"; const std::string ETH_IP = "ETH_IP"; const std::string ETH_PORT = "ETH_PORT"; -const std::string DEVICE_MANAGER_APP = "com.ohos.devicemanager"; +const std::string DEVICE_MANAGER_APP = "ohos.distributedhardware.devicemanager"; const std::string DEVICE_MANAGER_GROUPNAME = "DMPeerToPeerGroup"; const int64_t MIN_REQUEST_ID = 1000000000; diff --git a/services/devicemanagerservice/src/softbus/softbus_adapter.cpp b/services/devicemanagerservice/src/softbus/softbus_adapter.cpp index ad39578b411cb729d8c88568006c6fc084627742..aa7c01dcfdbe853e08c8d0a673383696ae32d01e 100644 --- a/services/devicemanagerservice/src/softbus/softbus_adapter.cpp +++ b/services/devicemanagerservice/src/softbus/softbus_adapter.cpp @@ -40,7 +40,7 @@ namespace OHOS { namespace DistributedHardware { namespace { -const std::string DEVICE_MANAGER_PACKAGE_NAME = "com.ohos.devicemanager"; +const std::string DEVICE_MANAGER_PACKAGE_NAME = "ohos.distributedhardware.devicemanager"; const int32_t CHECK_INTERVAL = 100000; // 100ms const uint32_t SUBSCRIBE_ID_PREFIX_LEN = 16; const int32_t SUBSCRIBE_ID_MASK = 0x0000FFFF; diff --git a/test/unittest/BUILD.gn b/test/unittest/BUILD.gn index 9c2c9dcce5ca119346df5eef8321d935763c381b..641872d8800312d46c4c90ee5ba1e63b30656355 100644 --- a/test/unittest/BUILD.gn +++ b/test/unittest/BUILD.gn @@ -51,7 +51,6 @@ config("device_manager_test_common_public_config") { cflags = [ "-Wall", - "-Werror", "-g3", "-Dprivate=public", "-Dprotected=public", diff --git a/utils/BUILD.gn b/utils/BUILD.gn index 368b7775b41f973dc1a4d4eb786832b146c96467..a218e443f9ac93621ca3474b149d9072327ebba4 100644 --- a/utils/BUILD.gn +++ b/utils/BUILD.gn @@ -61,8 +61,6 @@ if (defined(ohos_lite)) { "LOG_DOMAIN=0xD004100", ] - cflags_cc = build_flags - deps = [ "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", "//base/startup/syspara_lite/frameworks/parameter/src:sysparam",