Andromeda Compare

.circleci/config.yml

@@ -0,0 +1,25 @@
+version: 2.1
+
+setup: true
+
+orbs:
+  continuation: circleci/continuation@0.1.2
+  furilabs-buildd: furilabs-buildd/furilabs-buildd-orb@volatile
+
+jobs:
+  setup:
+    executor: continuation/default
+    resource_class: small
+    steps:
+      - furilabs-buildd/checkout
+      - furilabs-buildd/generate
+      - continuation/continue:
+          configuration_path: generated_config.yml
+
+workflows:
+  setup:
+    jobs:
+      - setup:
+          filters:
+            tags:
+              only: /^furios\/.*\/.*/

.gitignore

@@ -130,3 +130,6 @@ dmypy.json
 
 # Pyre type checker
 .pyre/
+
+# Added by Droidian
+!.circleci/

Makefile

@@ -4,59 +4,59 @@ USE_SYSTEMD ?= 1
 USE_DBUS_ACTIVATION ?= 1
 USE_NFTABLES ?= 0
 
-WAYDROID_DIR := $(PREFIX)/lib/waydroid
+SYSCONFDIR := /etc
+ANDROMEDA_DIR := $(PREFIX)/lib/andromeda
 BIN_DIR := $(PREFIX)/bin
 APPS_DIR := $(PREFIX)/share/applications
-METAINFO_DIR := $(PREFIX)/share/metainfo
+APPS_DIRECTORY_DIR := $(PREFIX)/share/desktop-directories
+APPS_MENU_DIR := $(SYSCONFDIR)/xdg/menus/applications-merged
 ICONS_DIR := $(PREFIX)/share/icons
 SYSD_DIR := $(PREFIX)/lib/systemd/system
+SYSD_USER_DIR := $(PREFIX)/lib/systemd/user
 DBUS_DIR := $(PREFIX)/share/dbus-1
 POLKIT_DIR := $(PREFIX)/share/polkit-1
-APPARMOR_DIR := /etc/apparmor.d
+LIBEXEC_DIR := $(PREFIX)/libexec
 
-INSTALL_WAYDROID_DIR := $(DESTDIR)$(WAYDROID_DIR)
+INSTALL_ANDROMEDA_DIR := $(DESTDIR)$(ANDROMEDA_DIR)
 INSTALL_BIN_DIR := $(DESTDIR)$(BIN_DIR)
 INSTALL_APPS_DIR := $(DESTDIR)$(APPS_DIR)
-INSTALL_METAINFO_DIR := $(DESTDIR)$(METAINFO_DIR)
+INSTALL_APPS_DIRECTORY_DIR := $(DESTDIR)$(APPS_DIRECTORY_DIR)
+INSTALL_APPS_MENU_DIR := $(DESTDIR)$(APPS_MENU_DIR)
 INSTALL_ICONS_DIR := $(DESTDIR)$(ICONS_DIR)
 INSTALL_SYSD_DIR := $(DESTDIR)$(SYSD_DIR)
+INSTALL_SYSD_USER_DIR := $(DESTDIR)$(SYSD_USER_DIR)
 INSTALL_DBUS_DIR := $(DESTDIR)$(DBUS_DIR)
 INSTALL_POLKIT_DIR := $(DESTDIR)$(POLKIT_DIR)
-INSTALL_APPARMOR_DIR := $(DESTDIR)$(APPARMOR_DIR)
+INSTALL_LIBEXEC_DIR := $(DESTDIR)$(LIBEXEC_DIR)
 
 build:
 	@echo "Nothing to build, run 'make install' to copy the files!"
 
 install:
-	install -d $(INSTALL_WAYDROID_DIR) $(INSTALL_BIN_DIR) $(INSTALL_DBUS_DIR)/system.d $(INSTALL_POLKIT_DIR)/actions
-	install -d $(INSTALL_APPS_DIR) $(INSTALL_METAINFO_DIR) $(INSTALL_ICONS_DIR)/hicolor/512x512/apps
-	cp -a data tools waydroid.py $(INSTALL_WAYDROID_DIR)
-	ln -sf $(WAYDROID_DIR)/waydroid.py $(INSTALL_BIN_DIR)/waydroid
-	ln -sf $(WAYDROID_DIR)/data/AppIcon.png $(INSTALL_ICONS_DIR)/hicolor/512x512/apps/waydroid.png
-	mv $(INSTALL_WAYDROID_DIR)/data/*.desktop $(INSTALL_APPS_DIR)
-	mv $(INSTALL_WAYDROID_DIR)/data/*.metainfo.xml $(INSTALL_METAINFO_DIR)
-	cp dbus/id.waydro.Container.conf $(INSTALL_DBUS_DIR)/system.d/
-	cp dbus/id.waydro.Container.policy $(INSTALL_POLKIT_DIR)/actions/
+	install -d $(INSTALL_ANDROMEDA_DIR) $(INSTALL_BIN_DIR) $(INSTALL_DBUS_DIR)/system.d $(INSTALL_POLKIT_DIR)/actions
+	install -d $(INSTALL_APPS_DIR) $(INSTALL_ICONS_DIR)/hicolor/scalable/apps $(INSTALL_APPS_DIRECTORY_DIR) $(INSTALL_APPS_MENU_DIR) $(INSTALL_LIBEXEC_DIR)
+	cp -a data tools andromeda.py $(INSTALL_ANDROMEDA_DIR)
+	ln -sf $(ANDROMEDA_DIR)/andromeda.py $(INSTALL_BIN_DIR)/andromeda
+	mv $(INSTALL_ANDROMEDA_DIR)/data/AppIcon.svg $(INSTALL_ICONS_DIR)/hicolor/scalable/apps/andromeda.svg
+	mv $(INSTALL_ANDROMEDA_DIR)/data/*.desktop $(INSTALL_APPS_DIR)
+	mv $(INSTALL_ANDROMEDA_DIR)/data/*.menu $(INSTALL_APPS_MENU_DIR)
+	mv $(INSTALL_ANDROMEDA_DIR)/data/*.directory $(INSTALL_APPS_DIRECTORY_DIR)
+	cp dbus/io.furios.Andromeda.Container.conf $(INSTALL_DBUS_DIR)/system.d/
+	cp dbus/io.furios.Andromeda.Notification.conf $(INSTALL_DBUS_DIR)/system.d/
+	cp dbus/io.furios.Andromeda.StateChange.conf $(INSTALL_DBUS_DIR)/system.d/
 	if [ $(USE_DBUS_ACTIVATION) = 1 ]; then \
 		install -d $(INSTALL_DBUS_DIR)/system-services; \
-		cp dbus/id.waydro.Container.service $(INSTALL_DBUS_DIR)/system-services/; \
+		install -d $(INSTALL_DBUS_DIR)/services/; \
+		cp dbus/io.furios.Andromeda.Container.service $(INSTALL_DBUS_DIR)/system-services/; \
+		cp dbus/io.furios.Andromeda.Notification.service $(INSTALL_DBUS_DIR)/system-services/; \
 	fi
 	if [ $(USE_SYSTEMD) = 1 ]; then \
-		install -d $(INSTALL_SYSD_DIR); \
-		cp systemd/waydroid-container.service $(INSTALL_SYSD_DIR); \
+		install -d $(INSTALL_SYSD_DIR) $(INSTALL_SYSD_USER_DIR); \
+		cp systemd/andromeda-container.service $(INSTALL_SYSD_DIR); \
+		cp systemd/andromeda-notification-server.service $(INSTALL_SYSD_DIR); \
+		cp systemd/andromeda-statechange-server.service $(INSTALL_SYSD_DIR); \
+		cp systemd/andromeda-session.service $(INSTALL_SYSD_USER_DIR); \
 	fi
 	if [ $(USE_NFTABLES) = 1 ]; then \
-		sed '/LXC_USE_NFT=/ s/false/true/' -i $(INSTALL_WAYDROID_DIR)/data/scripts/waydroid-net.sh; \
-	fi
-
-install_apparmor:
-	install -d $(INSTALL_APPARMOR_DIR) $(INSTALL_APPARMOR_DIR)/lxc
-	cp -f data/configs/apparmor_profiles/adbd $(INSTALL_APPARMOR_DIR)/adbd
-	cp -f data/configs/apparmor_profiles/android_app $(INSTALL_APPARMOR_DIR)/android_app
-	cp -f data/configs/apparmor_profiles/lxc-waydroid $(INSTALL_APPARMOR_DIR)/lxc/lxc-waydroid
-	# Load the profiles if not just packaging
-	if [ -z $(DESTDIR) ] && { aa-enabled --quiet || systemctl is-active -q apparmor; } 2>/dev/null; then \
-		apparmor_parser -r -T -W "$(INSTALL_APPARMOR_DIR)/adbd"; \
-		apparmor_parser -r -T -W "$(INSTALL_APPARMOR_DIR)/android_app"; \
-		apparmor_parser -r -T -W "$(INSTALL_APPARMOR_DIR)/lxc/lxc-waydroid"; \
+		sed '/LXC_USE_NFT=/ s/false/true/' -i $(INSTALL_ANDROMEDA_DIR)/data/scripts/andromeda-net.sh; \
 	fi

waydroid.py → andromeda.py

@@ -2,8 +2,10 @@
 # Copyright 2021 Oliver Smith
 # SPDX-License-Identifier: GPL-3.0-or-later
 # PYTHON_ARGCOMPLETE_OK
+import os
 import sys
 import tools
 
 if __name__ == "__main__":
+    os.umask(0o0022)
     sys.exit(tools.main())

data/Andromeda.desktop

@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=Andromeda
+Exec=andromeda
+Icon=/usr/share/icons/hicolor/scalable/apps/andromeda.svg
+Categories=X-Andromeda-App;
+X-Purism-FormFactor=Workstation;Mobile;
+NoDisplay=true