From 408584d5fe3f53d7df45a668a1c0aec912bf034c Mon Sep 17 00:00:00 2001 From: Joel Galenson <jgalenson@google.com> Date: Fri, 23 Mar 2018 12:40:26 -0700 Subject: [PATCH] Use user policy for compatibility tests. Use the user policy when running the compatibility tests. Bug: 74344625 Test: Built policy for many devices. Booted one device. Test: Delete some compat rules, verify error on userdebug. Change-Id: Ib2df2dfc06cdf55a839011e9a528e76160a9e436 (cherry picked from commit c1486218156db77f91933fb0f72015d1b4f60858) --- Android.mk | 3 ++- treble_sepolicy_tests_for_release.mk | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Android.mk b/Android.mk index 83631f548..bb042865c 100644 --- a/Android.mk +++ b/Android.mk @@ -1567,7 +1567,7 @@ BASE_PLAT_PRIVATE_POLICY := $(filter-out $(BOARD_PLAT_PRIVATE_SEPOLICY_DIR), $(P base_plat_policy.conf := $(intermediates)/base_plat_policy.conf $(base_plat_policy.conf): PRIVATE_MLS_SENS := $(MLS_SENS) $(base_plat_policy.conf): PRIVATE_MLS_CATS := $(MLS_CATS) -$(base_plat_policy.conf): PRIVATE_TARGET_BUILD_VARIANT := $(TARGET_BUILD_VARIANT) +$(base_plat_policy.conf): PRIVATE_TARGET_BUILD_VARIANT := user $(base_plat_policy.conf): PRIVATE_TGT_ARCH := $(my_target_arch) $(base_plat_policy.conf): PRIVATE_TGT_WITH_ASAN := $(with_asan) $(base_plat_policy.conf): PRIVATE_ADDITIONAL_M4DEFS := $(LOCAL_ADDITIONAL_M4DEFS) @@ -1638,6 +1638,7 @@ built_sepolicy := built_sepolicy_neverallows := built_plat_svc := built_vendor_svc := +built_plat_sepolicy := mapping_policy := my_target_arch := plat_pub_policy.cil := diff --git a/treble_sepolicy_tests_for_release.mk b/treble_sepolicy_tests_for_release.mk index ac8c80853..5f419d1a7 100644 --- a/treble_sepolicy_tests_for_release.mk +++ b/treble_sepolicy_tests_for_release.mk @@ -19,7 +19,7 @@ $(version)_PLAT_PRIVATE_POLICY := $(LOCAL_PATH)/prebuilts/api/$(version)/private $(version)_plat_policy.conf := $(intermediates)/$(version)_plat_policy.conf $($(version)_plat_policy.conf): PRIVATE_MLS_SENS := $(MLS_SENS) $($(version)_plat_policy.conf): PRIVATE_MLS_CATS := $(MLS_CATS) -$($(version)_plat_policy.conf): PRIVATE_TARGET_BUILD_VARIANT := $(TARGET_BUILD_VARIANT) +$($(version)_plat_policy.conf): PRIVATE_TARGET_BUILD_VARIANT := user $($(version)_plat_policy.conf): PRIVATE_TGT_ARCH := $(my_target_arch) $($(version)_plat_policy.conf): PRIVATE_TGT_WITH_ASAN := $(with_asan) $($(version)_plat_policy.conf): PRIVATE_ADDITIONAL_M4DEFS := $(LOCAL_ADDITIONAL_M4DEFS) -- GitLab