clipboard: Return empty string if error

[waydroid.git] / Makefile

diff --git a/Makefile b/Makefile
index 1fb7905058a9b4820fa2af8b348f2511cd15741c..c70814d34f2e6f29bc538192a63b292093ddb5d3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -35,12 +35,13 @@ install:
        fi
 
 install_apparmor:
+       install -d $(INSTALL_APPARMOR_DIR) $(INSTALL_APPARMOR_DIR)/lxc
        cp -f data/configs/apparmor_profiles/adbd $(INSTALL_APPARMOR_DIR)/adbd
-       apparmor_parser -r $(INSTALL_APPARMOR_DIR)/adbd
        cp -f data/configs/apparmor_profiles/android_app $(INSTALL_APPARMOR_DIR)/android_app
-       apparmor_parser -r $(INSTALL_APPARMOR_DIR)/android_app
        cp -f data/configs/apparmor_profiles/lxc-waydroid $(INSTALL_APPARMOR_DIR)/lxc/lxc-waydroid
-       apparmor_parser -r $(INSTALL_APPARMOR_DIR)/lxc/lxc-waydroid
-       sed --sandbox -i "/lxc.aa_profile/ s/unconfined/lxc-waydroid/g" $(DESTDIR)$(WAYDROID_DIR)/data/configs/config_1
-       sed --sandbox -i "/lxc.apparmor.profile/ s/unconfined/lxc-waydroid/g" $(DESTDIR)$(WAYDROID_DIR)/data/configs/config_2
-
+       # 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"; \
+       fi