aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Vander Stoep2017-11-20 15:25:47 -0600
committerJeffrey Vander Stoep2017-11-20 16:29:38 -0600
commitfe0910c9adf52cc162322cad101d456a085864c2 (patch)
tree5283285376ac3942449801350fac71160a870073 /Android.mk
parent9d9c370f31556c33f62e7889f64ad3a2728f1863 (diff)
downloadsystem-sepolicy-fe0910c9adf52cc162322cad101d456a085864c2.tar.gz
system-sepolicy-fe0910c9adf52cc162322cad101d456a085864c2.tar.xz
system-sepolicy-fe0910c9adf52cc162322cad101d456a085864c2.zip
Prepare treble_sepolicy_tests for inclusion in CTS
Unconditionally compile treble_sepolicy_tests. Make compat files conditional on running the compat tests. Bug: 37008075 Test: build Change-Id: Ib3aee6e93d285ca141803a13958fbcb38b891b68
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk7
1 files changed, 1 insertions, 6 deletions
diff --git a/Android.mk b/Android.mk
index f2efb1de..e0c99195 100644
--- a/Android.mk
+++ b/Android.mk
@@ -204,12 +204,6 @@ LOCAL_REQUIRED_MODULES += \
204 secilc \ 204 secilc \
205 plat_sepolicy_vers.txt \ 205 plat_sepolicy_vers.txt \
206 206
207ifneq ($(with_asan),true)
208LOCAL_REQUIRED_MODULES += \
209 treble_sepolicy_tests \
210
211endif
212
213# Include precompiled policy, unless told otherwise 207# Include precompiled policy, unless told otherwise
214ifneq ($(PRODUCT_PRECOMPILED_SEPOLICY),false) 208ifneq ($(PRODUCT_PRECOMPILED_SEPOLICY),false)
215LOCAL_REQUIRED_MODULES += precompiled_sepolicy precompiled_sepolicy.plat_and_mapping.sha256 209LOCAL_REQUIRED_MODULES += precompiled_sepolicy precompiled_sepolicy.plat_and_mapping.sha256
@@ -247,6 +241,7 @@ endif
247ifneq ($(with_asan),true) 241ifneq ($(with_asan),true)
248LOCAL_REQUIRED_MODULES += \ 242LOCAL_REQUIRED_MODULES += \
249 sepolicy_tests \ 243 sepolicy_tests \
244 treble_sepolicy_tests \
250 245
251endif 246endif
252 247