2 files changed, 8 insertions, 2 deletions

diff --git a/apps/codecs.c b/apps/codecs.c
index 249cd8f5c1..cd4a9d50eb 100644
--- a/apps/codecs.c
+++ b/apps/codecs.c
@@ -169,8 +169,8 @@ struct codec_api ci = {
 
 void codec_get_full_path(char *path, const char *codec_root_fn)
 {
-    snprintf(path, MAX_PATH-1, "%s/%s." CODEC_EXTENSION,
-             CODECS_DIR, codec_root_fn);
+    snprintf(path, MAX_PATH-1, CODECS_DIR "/" CODEC_PREFIX "%s."
+            CODEC_EXTENSION, codec_root_fn);
 }
 
 /* Returns pointer to and size of free codec RAM. Aligns to CACHEALIGN_SIZE. */
diff --git a/apps/metadata.h b/apps/metadata.h
index 3499e13f47..a191e43219 100644
--- a/apps/metadata.h
+++ b/apps/metadata.h
@@ -107,7 +107,13 @@ enum
 };
 
 #if CONFIG_CODEC == SWCODEC
+#if (CONFIG_PLATFORM & PLATFORM_ANDROID)
+#define CODEC_EXTENSION "so"
+#define CODEC_PREFIX "lib"
+#else
 #define CODEC_EXTENSION "codec"
+#define CODEC_PREFIX ""
+#endif
 
 #ifdef HAVE_RECORDING
 enum rec_format_indexes