From a9ccc262912a68408dbdeec9a9069bc174f2c6a6 Mon Sep 17 00:00:00 2001
From: Velsoth <velsoth@adhoc.zone>
Date: Wed, 13 Nov 2019 23:06:04 +0000
Subject: [PATCH] Include bundled apps

Conversations
OpenKeyChain
K9
DocumentViewer
VLC
WifiPrivacyPolice
Linphone
SimpleGallery
PrivacyBrowser
TorBrowser

Signed-off-by: Velsoth <velsoth@adhoc.zone>
---
 config/common.mk           | 14 +++++++
 get-prebuilts              | 12 ++++++
 prebuilt/common/Android.mk | 84 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 110 insertions(+)

diff --git a/config/common.mk b/config/common.mk
index e414190a..141d0eda 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -136,6 +136,20 @@ PRODUCT_PACKAGES += \
     Screencast \
     F-DroidPrivilegedExtension
 
+# Adhoc bundled apps
+PRODUCT_PACKAGES += \
+    F-Droid \
+    Conversations \
+    OpenKeyChain \
+    K9 \
+    DocumentViewer \
+    VLC \
+    WifiPrivacyPolice \
+    Linphone \
+    SimpleGallery \
+    PrivacyBrowser \
+    TorBrowser
+
 # Exchange support
 PRODUCT_PACKAGES += \
     Exchange2
diff --git a/get-prebuilts b/get-prebuilts
index 6f9d8be1..ee1b1156 100755
--- a/get-prebuilts
+++ b/get-prebuilts
@@ -37,3 +37,15 @@ function getPrebuild() {
 }
 
 getPrebuild fdroid   FDroid            org.fdroid.fdroid                    1007051
+
+getPrebuild fdroid   Conversations     eu.siacs.conversations               346
+getPrebuild fdroid   OpenKeyChain      org.sufficientlysecure.keychain      54000
+getPrebuild fdroid   K9                com.fsck.k9                          26000
+getPrebuild fdroid   DocumentViewer    org.sufficientlysecure.viewer        2817
+getPrebuild fdroid   VLC               org.videolan.vlc                     13010707
+getPrebuild fdroid   WifiPrivacyPolice be.uhasselt.privacypolice            13
+getPrebuild fdroid   Linphone          org.linphone                         4200
+getPrebuild fdroid   SimpleGallery     com.simplemobiletools.gallery.pro    271
+getPrebuild fdroid   PrivacyBrowser    com.stoutner.privacybrowser.standard 46
+
+getPrebuild guardian TorBrowser        tor-browser-9.0-android-armv7-multi
diff --git a/prebuilt/common/Android.mk b/prebuilt/common/Android.mk
index f15b178c..1acf8072 100644
--- a/prebuilt/common/Android.mk
+++ b/prebuilt/common/Android.mk
@@ -8,3 +8,87 @@ LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := EXECUTABLES
 LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
 include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := F-Droid
+LOCAL_MODULE_CLASS := APPS
+LOCAL_CERTIFICATE := PRESIGNED
+LOCAL_SRC_FILES := apps/FDroid.apk
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := Conversations
+LOCAL_MODULE_CLASS := APPS
+LOCAL_CERTIFICATE := PRESIGNED
+LOCAL_SRC_FILES := apps/Conversations.apk
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := OpenKeyChain
+LOCAL_MODULE_CLASS := APPS
+LOCAL_CERTIFICATE := PRESIGNED
+LOCAL_SRC_FILES := apps/OpenKeyChain.apk
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := K9
+LOCAL_MODULE_CLASS := APPS
+LOCAL_CERTIFICATE := PRESIGNED
+LOCAL_SRC_FILES := apps/K9.apk
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := DocumentViewer
+LOCAL_MODULE_CLASS := APPS
+LOCAL_CERTIFICATE := PRESIGNED
+LOCAL_SRC_FILES := apps/DocumentViewer.apk
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := VLC
+LOCAL_MODULE_CLASS := APPS
+LOCAL_CERTIFICATE := PRESIGNED
+LOCAL_SRC_FILES := apps/VLC.apk
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := WifiPrivacyPolice
+LOCAL_MODULE_CLASS := APPS
+LOCAL_CERTIFICATE := PRESIGNED
+LOCAL_SRC_FILES := apps/WifiPrivacyPolice.apk
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := Linphone
+LOCAL_MODULE_CLASS := APPS
+LOCAL_CERTIFICATE := PRESIGNED
+LOCAL_SRC_FILES := apps/Linphone.apk
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := SimpleGallery
+LOCAL_MODULE_CLASS := APPS
+LOCAL_CERTIFICATE := PRESIGNED
+LOCAL_SRC_FILES := apps/SimpleGallery.apk
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := PrivacyBrowser
+LOCAL_MODULE_CLASS := APPS
+LOCAL_CERTIFICATE := PRESIGNED
+LOCAL_SRC_FILES := apps/PrivacyBrowser.apk
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := TorBrowser
+LOCAL_MODULE_CLASS := APPS
+LOCAL_CERTIFICATE := PRESIGNED
+LOCAL_SRC_FILES := apps/TorBrowser.apk
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := Orbot
+LOCAL_MODULE_CLASS := APPS
+LOCAL_CERTIFICATE := PRESIGNED
+LOCAL_SRC_FILES := apps/Orbot.apk
+include $(BUILD_PREBUILT)