commit 5a2a19790df9a76f83d6235cf6b78f786b0fe4ff
author Thiébaud Weksteen <tweek@google.com> Mon Mar 24 00:21:37 2025 -0700
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Mar 24 00:21:37 2025 -0700
tree 8e5401e6ce018e851f789e8227e235ee2ab99d1c
parent 079da624c98bc8ae2bafa8fd07a1bdd42b37e3f1
parent b7e1bd13e869bab9ff171ab3758f4364e41e674b

Merge "Add marker to userdebug_or_eng macro" into main am: b7e1bd13e8

Original change: https://android-review.googlesource.com/c/platform/system/sepolicy/+/3556084

Change-Id: I55ea296f94dbd9122ba1470cdb3a0d0585d63b73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

public/te_macros

diff --git a/public/te_macros b/public/te_macros
index b90a232..f08e81e 100644
--- a/public/te_macros
+++ b/public/te_macros
@@ -599,7 +599,10 @@
 # Userdebug or eng builds
 # SELinux rules which apply only to userdebug or eng builds
 #
-define(`userdebug_or_eng', ifelse(target_build_variant, `eng', $1, ifelse(target_build_variant, `userdebug', $1)))
+define(`userdebug_or_eng', ifelse(target_build_variant, `eng', $1, ifelse(target_build_variant, `userdebug', $1,
+#
+# SUPPRESSED_BY_USERDEBUG_OR_ENG -- this marker is used by CTS -- do not modify
+)))
 
 #####################################
 # asan builds