diff --git a/services/hril/BUILD.gn b/services/hril/BUILD.gn index 384d7b71..f37a890f 100644 --- a/services/hril/BUILD.gn +++ b/services/hril/BUILD.gn @@ -12,7 +12,6 @@ # limitations under the License. import("//build/ohos.gni") -import("../../../core_service/telephony_core_service.gni") RIL_ADAPTER = "../../" RIL_HRIL = "../../services/hril/src" @@ -46,8 +45,6 @@ ohos_shared_library("hril") { "LOG_DOMAIN = 0xD001F08", ] - defines += telephony_extra_defines - deps = [ "$RIL_ADAPTER/interfaces/innerkits:hril_innerkits" ] external_deps = [ diff --git a/services/hril/src/hril_manager.cpp b/services/hril/src/hril_manager.cpp index 93576bfa..80e034b2 100644 --- a/services/hril/src/hril_manager.cpp +++ b/services/hril/src/hril_manager.cpp @@ -1026,14 +1026,13 @@ int32_t GetSimSlotCount() char simSlotCount[HRIL_SYSPARA_SIZE] = { 0 }; GetParameter(HRIL_TEL_SIM_SLOT_COUNT, HRIL_DEFAULT_SLOT_COUNT, simSlotCount, HRIL_SYSPARA_SIZE); int32_t simSlotCountNumber = std::atoi(simSlotCount); -#ifdef OHOS_BUILD_ENABLE_TELEPHONY_VSIM char vSimModemCount[HRIL_SYSPARA_SIZE] = { 0 }; GetParameter(HRIL_VSIM_MODEM_COUNT_STR, HRIL_DEFAULT_VSIM_MODEM_COUNT, vSimModemCount, HRIL_SYSPARA_SIZE); int32_t vSimModemCountNumber = std::atoi(vSimModemCount); if (simSlotCountNumber == DUAL_SLOT_COUNT && vSimModemCountNumber == MAX_SLOT_COUNT) { simSlotCountNumber = MAX_SLOT_COUNT; } -#endif + TELEPHONY_LOGI("GetSimSlotCount, %{public}d", simSlotCountNumber); return simSlotCountNumber; }