Merge "/odm is another vendor partition that can be customied by ODMs"

am: 5872e84f

Change-Id: Ice57a32ba00d99b74ed260706eee7dadae56e91a

private/file_contexts

@@ -315,7 +315,11 @@
 #############################
 # OEM and ODM files
 #
-/odm(/.*)?              u:object_r:vendor_file:s0
+/odm(/.*)?                                    u:object_r:vendor_file:s0
+/odm/lib(64)?/egl(/.*)?                       u:object_r:same_process_hal_file:s0
+/odm/lib(64)?/hw                              u:object_r:vendor_hal_file:s0
+/odm/lib(64)?/vndk-sp(/.*)?                   u:object_r:vndk_sp_file:s0
+
 /oem(/.*)?              u:object_r:oemfs:s0
 
 

private/file_contexts_asan

@@ -2,6 +2,8 @@
 /data/asan/system/lib64(/.*)?              u:object_r:system_file:s0
 /data/asan/vendor/lib(/.*)?                u:object_r:system_file:s0
 /data/asan/vendor/lib64(/.*)?              u:object_r:system_file:s0
+/data/asan/odm/lib(/.*)?                   u:object_r:system_file:s0
+/data/asan/odm/lib64(/.*)?                 u:object_r:system_file:s0
 /system/bin/asan_extract       u:object_r:asan_extract_exec:s0
 /system/bin/asanwrapper        u:object_r:asanwrapper_exec:s0
 /system/bin/asan/app_process   u:object_r:zygote_exec:s0