commit fe0910c9adf52cc162322cad101d456a085864c2
author Jeff Vander Stoep <jeffv@google.com> Mon Nov 20 13:25:47 2017 -0800
committer Jeffrey Vander Stoep <jeffv@google.com> Mon Nov 20 22:29:38 2017 +0000
tree 5283285376ac3942449801350fac71160a870073
parent 9d9c370f31556c33f62e7889f64ad3a2728f1863

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

Android.mk

diff --git a/Android.mk b/Android.mk
index f2efb1d..e0c9919 100644
--- a/Android.mk
+++ b/Android.mk
@@ -204,12 +204,6 @@
     secilc \
     plat_sepolicy_vers.txt \
 
-ifneq ($(with_asan),true)
-LOCAL_REQUIRED_MODULES += \
-    treble_sepolicy_tests \
-
-endif
-
 # Include precompiled policy, unless told otherwise
 ifneq ($(PRODUCT_PRECOMPILED_SEPOLICY),false)
 LOCAL_REQUIRED_MODULES += precompiled_sepolicy precompiled_sepolicy.plat_and_mapping.sha256
@@ -247,6 +241,7 @@
 ifneq ($(with_asan),true)
 LOCAL_REQUIRED_MODULES += \
     sepolicy_tests \
+    treble_sepolicy_tests \
 
 endif