From 4d56ff8e9ce3af3dfccf5284fc8c82206c4b325e Mon Sep 17 00:00:00 2001
From: Nick Kralevich <nnk@google.com>
Date: Fri, 11 Aug 2017 15:20:47 -0700
Subject: [PATCH] Build sepolicy_tests for all build types
Currently the build target sepolicy_tests is only being built for Treble
devices. However, the tests performed are not specific to Treble
devices.
Unconditionally build sepolicy_tests regardless of Trebleized status.
Bug: 64612408
Test: Policy compiles
Change-Id: I1bf37f6e17a0bcfde451fe668e32798120a66043
---
Android.mk | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/Android.mk b/Android.mk
index 0503b5544..07c075e26 100644
--- a/Android.mk
+++ b/Android.mk
@@ -194,12 +194,12 @@ LOCAL_REQUIRED_MODULES += \
plat_sepolicy.cil \
plat_and_mapping_sepolicy.cil.sha256 \
secilc \
- plat_sepolicy_vers.txt
+ plat_sepolicy_vers.txt \
ifneq ($(with_asan),true)
LOCAL_REQUIRED_MODULES += \
treble_sepolicy_tests \
- sepolicy_tests
+
endif
# Include precompiled policy, unless told otherwise
@@ -213,7 +213,13 @@ endif
LOCAL_REQUIRED_MODULES += \
nonplat_file_contexts \
- plat_file_contexts
+ plat_file_contexts \
+
+ifneq ($(with_asan),true)
+LOCAL_REQUIRED_MODULES += \
+ sepolicy_tests \
+
+endif
include $(BUILD_PHONY_PACKAGE)
--
GitLab