Expand with options
Supports both arm64-v8a & x86_64 ABI through the use of Options
##### Options Usage:
**If no option is passed, it will prompt you to make a choice**
$ bash update.sh X
- 1 = x86_64 ABI **default options**
- 2 = arm64-v8a ABI diff --git a/README.md b/README.md
index 86d68a9..185a760 100644
--- a/README.md
+++ b/README.md
@@ -1,28 +1,58 @@
# vendor_foss
A set of FOSS applications to include in an AOSP
+*with added options and features*
+
+## Features:
+
+ - Supports F-Droid Mirrors - So if main repo fails, it will try the
+ rest of the mirrors from the F-Droid mirror list
+ - Supports both arm64-v8a & x86_64 ABI through the use of Options
+
+ ##### Options Usage:
+
+ **If no option is passed, it will prompt you to make a choice**
+
+ $ bash update.sh X
+
+ - 1 = x86_64 ABI **default options**
+ - 2 = arm64-v8a ABI
+
## Included Apps:
-- F-Droid
-- NewPipe
-- Etar
-- CalDAV/CardDAV Sync
-- Aurora Store*
-- Phonograph
-- QKSMS
-- OsmAnd
-- Simple Gallery
-- Simple Calculator
-- Mozilla Nlp*
-- Nominatim Nlp*
-- MPV
-- MicroG Service Core*
-- MicroG Droidguard Helper*
-- MicroG Services Framework Proxy*
-- FakeStore*
-- Bromite
+#### From F-Droid Repo:
+
+- Terminal Emulator - com.termoneplus
+- Navigation - net.osmand.plus
+- Calendar - ws.xsoh.etar
+- Pdf viewer - com.artifex.mupdf.viewer.app
+- Aurora App Store - com.aurora.store
+- Aurora Fdroid - com.aurora.adroid
+- K9 Mail client - com.fsck.k9
+- Calendar/Contacts sync - com.etesync.syncadapter
+- Todo lists - org.tasks
+- Fake assistant that uses duckduckgo - co.pxhouse.sas
+- Gallery App - com.simplemobiletools.gallery.pro
+- fdroid extension - org.fdroid.fdroid.privileged
+- Phonograph - com.kabouzeid.gramophone
+- Alarmio - me.jfenn.alarmio
+- Mozilla Nlp - org.microg.nlp.backend.ichnaea
+- Nominatim Nlp - org.microg.nlp.backend.nominatim
+- EtchDroid USB Writer - eu.depau.etchdroid
+- NewPipe - org.schabi.newpipe
+- Midori Browser - org.midorinext.android
+
+#### From MicroG Repo:
+
+- MicroG GMS - com.google.android.gms
+- MicroG GSF - com.google.android.gsf
+- MicroG FakeStore - com.android.vending
+- MicroG DroidGuard - org.microg.gms.droidguard
+
+#### From NanoLX Repo:
+
+- MVP Video Player - is.xyz.mpv
### Notes
-- Starred ones has to removed for microG removal.
- For microG, this [commit](https://github.com/microg/android_packages_apps_GmsCore/pull/957) is needed
diff --git a/update.sh b/update.sh
index 22178ab..87a93a0 100755
--- a/update.sh
+++ b/update.sh
@@ -29,6 +29,7 @@
nanolx_dir="tmp/nanolx"
# Device type selection
+if [ "$1" == "" ]; then
PS3='Which device type do you plan on building?: '
echo -e ${YELLOW}"(default is 'ABI:x86_64 & ABI2:x86')"
TMOUT=10
@@ -57,6 +58,18 @@
MAIN_ARCH="x86_64"
SUB_ARCH="x86"
fi
+fi
+
+if [ "$1" == "1" ]; then
+ echo "ABI:x86_64 & ABI2:x86 was preselected"
+ MAIN_ARCH="x86_64"
+ SUB_ARCH="x86"
+fi
+if [ "$1" == "2" ]; then
+ echo "ABI:arm64-v8a & ABI2:armeabi-v7a was preselected"
+ MAIN_ARCH="arm64-v8a"
+ SUB_ARCH="armeabi-v7a"
+fi
addCopy() {
addition=""
@@ -66,14 +79,14 @@
if [ "$native" == "$MAIN_ARCH" ];then
addition="
LOCAL_PREBUILT_JNI_LIBS := \\
-$(unzip -lv bin/$1 |grep -v Stored |sed -nE 's;.*(lib/'"$MAIN_ARCH"'/.*);\t\1 \\;p')
+$(unzip -olv bin/$1 |grep -v Stored |sed -nE 's;.*(lib/'"$MAIN_ARCH"'/.*);\t\1 \\;p')
"
fi
if [ "$native" == "$SUB_ARCH" ];then
addition="
LOCAL_MULTILIB := 32
LOCAL_PREBUILT_JNI_LIBS := \\
-$(unzip -lv bin/$1 |grep -v Stored |sed -nE 's;.*(lib/'"$SUB_ARCH"'/.*);\t\1 \\;p')
+$(unzip -olv bin/$1 |grep -v Stored |sed -nE 's;.*(lib/'"$SUB_ARCH"'/.*);\t\1 \\;p')
"
fi
fi
@@ -250,7 +263,7 @@
# F-Droid App Store
#~ downloadFromFdroid org.fdroid.fdroid
#fdroid extension
-#~ downloadFromFdroid org.fdroid.fdroid.privileged
+downloadFromFdroid org.fdroid.fdroid.privileged
#Phonograph
downloadFromFdroid com.kabouzeid.gramophone "Eleven"
#Alarmio
@@ -259,13 +272,21 @@
downloadFromFdroid org.microg.nlp.backend.ichnaea
#Nominatim Nlp
downloadFromFdroid org.microg.nlp.backend.nominatim
-# Midori Browser
-downloadFromFdroid org.midorinext.android "Browser2 QuickSearchBox"
# EtchDroid USB Writer
downloadFromFdroid eu.depau.etchdroid
# NewPipe
downloadFromFdroid org.schabi.newpipe
+# Astian Apps
+# Midori Browser
+downloadFromFdroid org.midorinext.android "Browser2 QuickSearchBox"
+# Astian Spika
+# downloadFromFdroid org.astianspika.android
+# Astian Cloud
+# downloadFromFdroid org.astiancloud.android
+# Astian VPN
+# downloadFromFdroid org.astianvpn.android
+
#Web browser
#~ downloadFromFdroid org.mozilla.fennec_fdroid "Browser2 QuickSearchBox"
#Public transportation