resolved conflicts for merge of d7e004eb to lmp-mr1-dev-plus-aosp

Change-Id: I991c185f258610ca74bc185260e549018a9d956a

domain.te

@@ -59,6 +59,10 @@ userdebug_or_eng(`
 
   # allow "gdbserver --attach" to work for su.
   allow domain su:process sigchld;
+
+  # Allow writing coredumps to /cores/*
+  allow domain coredump_file:file create_file_perms;
+  allow domain coredump_file:dir ra_dir_perms;
 ')
 
 ###

file.te

@@ -45,6 +45,8 @@ type unlabeled, file_type;
 type system_file, file_type;
 # Type for /system/bin/logcat.
 type logcat_exec, exec_type, file_type;
+# /cores for coredumps on userdebug / eng builds
+type coredump_file, file_type;
 # Default type for anything under /data.
 type system_data_file, file_type, data_file_type;
 # /data/.layout_version or other installd-created files that

file_contexts

@@ -225,6 +225,9 @@
 /data/misc/wifi/hostapd(/.*)?   u:object_r:wpa_socket:s0
 /data/misc/zoneinfo(/.*)?       u:object_r:zoneinfo_data_file:s0
 
+# coredump directory for userdebug/eng devices
+/cores(/.*)?                    u:object_r:coredump_file:s0
+
 # Wallpaper file for other users
 /data/system/users/[0-9]+/wallpaper		u:object_r:wallpaper_file:s0
 #############################