From 590f661715c991af40fb2de8b5bfe3b2bf2a606c Mon Sep 17 00:00:00 2001
From: Tad <tad@spotco.us>
Date: Wed, 24 Apr 2019 12:25:36 -0400
Subject: Revert "Merge branch 'master' of github.com:netblue30/firejail"

This reverts commit 0d42e12f11825f84d6bf6f9c667cd16272a3700c, reversing
changes made to 63efb454a4af0ee5d4905f7cfae193138aef3e15.
---
 etc/aosp.profile | 46 +++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 45 insertions(+), 1 deletion(-)

(limited to 'etc/aosp.profile')

diff --git a/etc/aosp.profile b/etc/aosp.profile
index 98c23139b..bdfefa923 100644
--- a/etc/aosp.profile
+++ b/etc/aosp.profile
@@ -1 +1,45 @@
-]0;firejail /usr/bin/meld ./etc/aosp_LOCAL_29017.profile ./etc/aosp_BASE_29017.profile ./etc/aosp_REMOTE_29017.profile 
\ No newline at end of file
+# Firejail profile for aosp
+# This file is overwritten after every install/update
+# Persistent local customizations
+include aosp.local
+# Persistent global definitions
+include globals.local
+
+
+noblacklist ${HOME}/.android
+noblacklist ${HOME}/.bash_history
+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}/.repo_.gitconfig.json
+noblacklist ${HOME}/.repoconfig
+noblacklist ${HOME}/.ssh
+noblacklist ${HOME}/.tooling
+
+include disable-common.inc
+include disable-passwdmgr.inc
+include disable-programs.inc
+include disable-xdg.inc
+
+include whitelist-var-common.inc
+
+caps.drop all
+ipc-namespace
+netfilter
+no3d
+nodvd
+nogroups
+nonewprivs
+noroot
+nosound
+notv
+novideo
+protocol unix,inet,inet6
+#seccomp
+shell none
+
+private-tmp
-- 
cgit v1.2.3-70-g09d2