Merge branch 'master' of github.com:netblue30/firejail

1 files changed, 1 insertions, 43 deletions

diff --git a/etc/android-studio.profile b/etc/android-studio.profile
index ff7fb6711..ba54697e1 100644
--- a/etc/android-studio.profile
+++ b/etc/android-studio.profile
@@ -1,43 +1 @@
-# Firejail profile for android-studio
-# This file is overwritten after every install/update
-# Persistent local customizations
-include android-studio.local
-# Persistent global definitions
-include globals.local
-
-noblacklist ${HOME}/.AndroidStudio*
-noblacklist ${HOME}/.android
-noblacklist ${HOME}/.config/git
-noblacklist ${HOME}/.gitconfig
-noblacklist ${HOME}/.git-credentials
-noblacklist ${HOME}/.gradle
-noblacklist ${HOME}/.jack-server
-noblacklist ${HOME}/.jack-settings
-noblacklist ${HOME}/.java
-noblacklist ${HOME}/.local/share/JetBrains
-noblacklist ${HOME}/.ssh
-noblacklist ${HOME}/.tooling
-
-include disable-common.inc
-include disable-passwdmgr.inc
-include disable-programs.inc
-
-include whitelist-var-common.inc
-
-caps.drop all
-netfilter
-nodvd
-nogroups
-nonewprivs
-noroot
-notv
-novideo
-protocol unix,inet,inet6
-seccomp
-shell none
-
-private-cache
-# private-tmp
-
-# noexec /tmp breaks 'Android Profiler'
-#noexec /tmp
+]0;firejail /usr/bin/meld ./etc/android-studio_LOCAL_29017.profile ./etc/android-studio_BASE_29017.profile ./etc/android-studio_REMOTE_29017.profile 
\ No newline at end of file