diff --git a/modules/audio_device/android/audio_record_jni.cc b/modules/audio_device/android/audio_record_jni.cc index a7d44a6189..4b66cdff4f 100644 --- a/modules/audio_device/android/audio_record_jni.cc +++ b/modules/audio_device/android/audio_record_jni.cc @@ -248,7 +248,7 @@ void AudioRecordJni::OnCacheDirectBufferAddress(JNIEnv* env, RTC_DCHECK(!direct_buffer_address_); direct_buffer_address_ = env->GetDirectBufferAddress(byte_buffer); jlong capacity = env->GetDirectBufferCapacity(byte_buffer); - ALOGD("direct buffer capacity: %lld", capacity); + ALOGD("direct buffer capacity: %ld", static_cast(capacity)); direct_buffer_capacity_in_bytes_ = static_cast(capacity); } diff --git a/modules/audio_device/android/audio_track_jni.cc b/modules/audio_device/android/audio_track_jni.cc index eca225f305..5f110aa08f 100644 --- a/modules/audio_device/android/audio_track_jni.cc +++ b/modules/audio_device/android/audio_track_jni.cc @@ -226,7 +226,7 @@ void AudioTrackJni::OnCacheDirectBufferAddress(JNIEnv* env, RTC_DCHECK(!direct_buffer_address_); direct_buffer_address_ = env->GetDirectBufferAddress(byte_buffer); jlong capacity = env->GetDirectBufferCapacity(byte_buffer); - ALOGD("direct buffer capacity: %lld", capacity); + ALOGD("direct buffer capacity: %ld", static_cast(capacity)); direct_buffer_capacity_in_bytes_ = static_cast(capacity); const size_t bytes_per_frame = audio_parameters_.channels() * sizeof(int16_t); frames_per_buffer_ = direct_buffer_capacity_in_bytes_ / bytes_per_frame; diff --git a/sdk/android/src/jni/pc/androidnetworkmonitor.cc b/sdk/android/src/jni/pc/androidnetworkmonitor.cc index 5e85c845be..c6efdc445f 100644 --- a/sdk/android/src/jni/pc/androidnetworkmonitor.cc +++ b/sdk/android/src/jni/pc/androidnetworkmonitor.cc @@ -11,8 +11,10 @@ #include "sdk/android/src/jni/pc/androidnetworkmonitor.h" #include +#ifndef RTLD_NOLOAD // This was added in Lollipop to dlfcn.h #define RTLD_NOLOAD 4 +#endif #include "rtc_base/bind.h" #include "rtc_base/checks.h"