From 98f83b67cc58730c95a70e83ada68e29ecd8ef89 Mon Sep 17 00:00:00 2001 From: Joel Galenson <jgalenson@google.com> Date: Tue, 22 May 2018 09:22:41 -0700 Subject: [PATCH] Exclude bug_map from the sepolicy_freeze_test. The bug_map file is only used whitelisting known test failures. It needs to change fairly often to fix new failures and it doesn't affect users, so it shouldn't matter if it diverges from prebuilts. Test: Enable this test and build with and without different bug_maps. Change-Id: I9176a6c7e9f7852a0cd7802fd121b1e86b216b22 --- Android.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Android.mk b/Android.mk index 583aa1e8c..e1adea4ca 100644 --- a/Android.mk +++ b/Android.mk @@ -1621,8 +1621,8 @@ $(LOCAL_BUILT_MODULE): PRIVATE_BASE_PLAT_PUBLIC_PREBUILT := $(base_plat_public_p $(LOCAL_BUILT_MODULE): PRIVATE_BASE_PLAT_PRIVATE_PREBUILT := $(base_plat_private_prebuilt) $(LOCAL_BUILT_MODULE): $(all_frozen_files) ifneq ($(PLATFORM_SEPOLICY_VERSION),$(TOT_SEPOLICY_VERSION)) - @diff -rq $(PRIVATE_BASE_PLAT_PUBLIC_PREBUILT) $(PRIVATE_BASE_PLAT_PUBLIC) - @diff -rq $(PRIVATE_BASE_PLAT_PRIVATE_PREBUILT) $(PRIVATE_BASE_PLAT_PRIVATE) + @diff -rq -x bug_map $(PRIVATE_BASE_PLAT_PUBLIC_PREBUILT) $(PRIVATE_BASE_PLAT_PUBLIC) + @diff -rq -x bug_map $(PRIVATE_BASE_PLAT_PRIVATE_PREBUILT) $(PRIVATE_BASE_PLAT_PRIVATE) endif # ($(PLATFORM_SEPOLICY_VERSION),$(TOT_SEPOLICY_VERSION)) $(hide) touch $@ -- GitLab