From d5b1835abc3f31513a3a72315eadfd61c3627fe4 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Mon, 26 Sep 2022 05:06:14 +0300 Subject: [PATCH] Move qti-testscripts definition out of userdebug_or_eng check sepolicy compat_test tests fail to compile on user builds because of the missing definitions. Test: breakfast FP4 user && m Change-Id: I9e5ba85a48e757cdf45e90103b3ce10f22a912d0 --- generic/prebuilts/api/30.0/public/qti-testscripts.te | 4 +--- generic/prebuilts/api/31.0/private/qti-testscripts.te | 2 +- generic/prebuilts/api/32.0/private/qti-testscripts.te | 2 +- generic/private/qti-testscripts.te | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/generic/prebuilts/api/30.0/public/qti-testscripts.te b/generic/prebuilts/api/30.0/public/qti-testscripts.te index 48ea0a9f..0ae77fc7 100644 --- a/generic/prebuilts/api/30.0/public/qti-testscripts.te +++ b/generic/prebuilts/api/30.0/public/qti-testscripts.te @@ -25,6 +25,4 @@ # OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN # IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -userdebug_or_eng(` - type qti-testscripts, domain, mlstrustedsubject; -') +type qti-testscripts, domain, mlstrustedsubject; diff --git a/generic/prebuilts/api/31.0/private/qti-testscripts.te b/generic/prebuilts/api/31.0/private/qti-testscripts.te index 4bdbb836..26bd7252 100644 --- a/generic/prebuilts/api/31.0/private/qti-testscripts.te +++ b/generic/prebuilts/api/31.0/private/qti-testscripts.te @@ -28,8 +28,8 @@ #as the exec is defined in file_context it is hitting build # error in user build so moving out of the macro type qti-testscripts_exec, system_file_type, exec_type, file_type; +type qti-testscripts, domain, mlstrustedsubject; userdebug_or_eng(` - type qti-testscripts, domain, mlstrustedsubject; typeattribute qti-testscripts coredomain; permissive qti-testscripts; init_daemon_domain(qti-testscripts) diff --git a/generic/prebuilts/api/32.0/private/qti-testscripts.te b/generic/prebuilts/api/32.0/private/qti-testscripts.te index 4bdbb836..26bd7252 100644 --- a/generic/prebuilts/api/32.0/private/qti-testscripts.te +++ b/generic/prebuilts/api/32.0/private/qti-testscripts.te @@ -28,8 +28,8 @@ #as the exec is defined in file_context it is hitting build # error in user build so moving out of the macro type qti-testscripts_exec, system_file_type, exec_type, file_type; +type qti-testscripts, domain, mlstrustedsubject; userdebug_or_eng(` - type qti-testscripts, domain, mlstrustedsubject; typeattribute qti-testscripts coredomain; permissive qti-testscripts; init_daemon_domain(qti-testscripts) diff --git a/generic/private/qti-testscripts.te b/generic/private/qti-testscripts.te index 24682972..902dba1d 100644 --- a/generic/private/qti-testscripts.te +++ b/generic/private/qti-testscripts.te @@ -28,8 +28,8 @@ #as the exec is defined in file_context it is hitting build # error in user build so moving out of the macro type qti-testscripts_exec, system_file_type, exec_type, file_type; +type qti-testscripts, domain, mlstrustedsubject; userdebug_or_eng(` - type qti-testscripts, domain, mlstrustedsubject; typeattribute qti-testscripts coredomain; permissive qti-testscripts; init_daemon_domain(qti-testscripts)