commit 946b4b76f02563c609bb27cad79738a168eb04d4
author Treehugger Robot <treehugger-gerrit@google.com> Wed Feb 14 18:47:26 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Feb 14 18:47:26 2018 +0000
tree b80aaac65158b07106c051b9a1962006448af660
parent 5791086651ebbfcc31daf998c790eeeea93dfdb2
parent 54c9dafb5e11b6d02c4008322dbe8ce8328389f7

Merge "Allow wpa_supplicant to read security logging property."

Android.mk

diff --git a/Android.mk b/Android.mk
index cece346..8cbc608 100644
--- a/Android.mk
+++ b/Android.mk
@@ -233,11 +233,13 @@
 endif
 
 ifneq ($(with_asan),true)
+ifneq ($(SELINUX_IGNORE_NEVERALLOWS),true)
 LOCAL_REQUIRED_MODULES += \
     sepolicy_tests \
     treble_sepolicy_tests \
 
 endif
+endif
 
 include $(BUILD_PHONY_PACKAGE)
 

private/bug_map

diff --git a/private/bug_map b/private/bug_map
index 712b5c9..fe61dcc 100644
--- a/private/bug_map
+++ b/private/bug_map
@@ -2,6 +2,7 @@
 crash_dump app_data_file dir 68319037
 crash_dump bluetooth_data_file dir 68319037
 crash_dump resourcecache_data_file dir 68319037
+crash_dump system_data_file file 68319037
 crash_dump vendor_overlay_file dir 68319037
 hal_fingerprint_default system_data_file dir 73068008
 hal_graphics_allocator_default unlabeled dir 70180742