move tools into tools/

data/build-package.pkg-bromite

@@ -14,8 +14,10 @@ create_bromite_webview_package () {
 
 	zip_add CommonInstaller
 	zip_add CommonAddon
-	zip_add busybox.arm
-	zip_add busybox.x86
+
+	cd "${CWD}/tools"
+	zip_add "busybox*"
+	cd "${CWD}"
 
 	zip_add_doc
 	zip_add_config .nanodroid-setup 0

data/build-package.pkg-fdroid

@@ -17,9 +17,13 @@ create_fdroid_package() {
 	zip_add
 	cd "${CWD}"
 
-	for file in Common{Installer,Addon} busybox.* aapt.*; do
-		zip_add ${file}
-	done
+	zip_add CommonInstaller
+	zip_add CommonAddon
+
+	cd "${CWD}/tools"
+	zip_add "busybox*"
+	zip_add "aapt*"
+	cd "${CWD}"
 
 	zip_add_doc
 	zip_add_config .nanodroid-setup 0

data/build-package.pkg-full

@@ -10,9 +10,12 @@ create_full_package () {
 	zip_add
 	cd "${CWD}"
 
-	for file in Common{Installer,Addon} busybox.* sqlite3.* aapt.*; do
-		zip_add ${file}
-	done
+	zip_add CommonInstaller
+	zip_add CommonAddon
+
+	cd "${CWD}/tools"
+	zip_add "*"
+	cd "${CWD}"
 
 	zip_add_doc
 	zip_add_config .nanodroid-overlay

data/build-package.pkg-microg

@@ -30,9 +30,12 @@ create_microg_package() {
 	zip_add
 	cd "${CWD}"
 
-	for file in Common{Installer,Addon} busybox.* sqlite3.* aapt.*; do
-		zip_add ${file}
-	done
+	zip_add CommonInstaller
+	zip_add CommonAddon
+
+	cd "${CWD}/tools"
+	zip_add "*"
+	cd "${CWD}"
 
 	zip_add_doc
 	zip_add_config .nanodroid-overlay

data/build-package.pkg-misc

@@ -8,10 +8,11 @@ create_patcher_package() {
 
 	cd "${CWD}/patcher"
 	zip_add
+
+	cd "${CWD}/tools"
+	zip_add "busybox*"
 	cd "${CWD}"
 
-	zip_add busybox.arm
-	zip_add busybox.x86
 	zip_add_doc
 
 	sum_sign_package "${ZIP}"

data/build-package.pkg-osmand

@@ -16,8 +16,10 @@ create_osmand_package() {
 
 	zip_add CommonInstaller
 	zip_add CommonAddon
-	zip_add busybox.arm
-	zip_add busybox.x86
+
+	cd "${CWD}/tools"
+	zip_add "busybox*"
+	cd "${CWD}"
 
 	zip_add_doc
 	zip_add_config .nanodroid-setup 0