- fixes for Android + ongoing migration to latest resiprocate

src/engine/audio/Audio_Android.cpp

@@ -365,8 +365,9 @@ void AndroidInputDevice::DeviceCallback(SLAndroidSimpleBufferQueueItf bq, void *
 // ------------ AndroidOutputDevice -----------------
 AndroidOutputDevice::AndroidOutputDevice(int devId)
 {
-  ICELogDebug(<< "Creating AndroidOutputDevice. This is: " << StringHelper::toHex(this));
+  ICELogDebug(<< "Creating AndroidOutputDevice. This is: " << strx::toHex(this));
 }
+
 AndroidOutputDevice::~AndroidOutputDevice()
 {
   ICELogDebug(<< "Deleting AndroidOutputDevice.");
@@ -595,4 +596,4 @@ void AndroidOutputDevice::DeviceCallback(SLAndroidSimpleBufferQueueItf bq, void*
   {}
 }
 
-#endif // TARGET_ANDROID
+#endif // TARGET_ANDROID

src/engine/audio/Audio_Helper.cpp

@@ -102,6 +102,7 @@ unsigned TimeSource::time()
 #if defined(TARGET_ANDROID)
   assert(0);
 #endif
+  return 0;
 }
 
 // --- StubTimer ---

src/engine/audio/CMakeLists.txt

@@ -18,6 +18,7 @@ set (AUDIOLIB_SOURCES
     Audio_Null.cpp
     Audio_CoreAudio.cpp
     Audio_DirectSound.cpp
+    Audio_Android.cpp
     Audio_WavFile.cpp
 )