Minor updates and code cleanup

Author: vinayhvaghamshi

configs/default.sh

@@ -18,7 +18,9 @@
 # when '-l all' will use blew default config:
 apple_default_libs="openssl opus dav1d dvdread freetype fribidi harfbuzz unibreak ass ffmpeg smb2 bluray"
 
+android_default_libs="openssl opus dav1d dvdread xml2 freetype fribidi harfbuzz unibreak fontconfig ass ffmpeg smb2 bluray"
+
 export ios_default_libs="$apple_default_libs"
 export macos_default_libs="$apple_default_libs"
 export tvos_default_libs="$apple_default_libs"
-export android_default_libs="$apple_default_libs"
+export android_default_libs="$android_default_libs"

do-compile/android/any.sh

@@ -29,8 +29,13 @@ do_lipo_lib() {
 
     for arch in $archs; do
         local lib_dir="$MR_PRODUCT_ROOT/$LIB_NAME-$arch"
-        sed -i "" "s|-lpthread|-pthread|" "$lib_dir"/lib/pkgconfig/*.pc
+        
         if [ -d "$lib_dir" ]; then
+            # Fix .pc files
+            sed -i.bak 's|-lpthread|-pthread|' "$lib_dir"/lib/pkgconfig/*.pc
+            find "$lib_dir"/lib/pkgconfig -name "*.bak" -delete
+
+            # Copy the directory
             mkdir -p "$MR_UNI_PROD_DIR/$LIB_NAME"
             cp -Rf "$lib_dir" "$MR_UNI_PROD_DIR/$LIB_NAME"
         else
@@ -136,4 +141,4 @@ function main() {
     esac
 }
 
-main
+main

do-init/copy-local-repo.sh

@@ -26,7 +26,7 @@ function main() {
     local dest_repo=$2
 
     cd $src_repo
-    local full_src_repo_path="file://"$(PWD)
+    local full_src_repo_path="file://$(PWD)"
     cd - >/dev/null
 
     if [[ -d $dest_repo ]]; then
@@ -37,4 +37,4 @@ function main() {
     git clone -b localBranch "$full_src_repo_path" $dest_repo --depth=1
 }
 
-main $*
+main $*