| Révision | a5d3c6d2a763e4207de2de0227a1e635df5cc81a (tree) |
|---|---|
| l'heure | 2019-10-07 12:49:19 |
| Auteur | Chih-Wei Huang <cwhuang@linu...> |
| Commiter | Chih-Wei Huang |
Merge remote-tracking branch 'x86/oreo-x86' into pie-x86
BoardConfig.mk (diff) app/TermOnePlus.apk (diff) nativebridge/bin/enable_nativebridge (diff) sepolicy/plat_private/file_contexts (diff) sepolicy/plat_private/surfaceflinger.te (diff) sepolicy/plat_private/zygote.te (diff) sepolicy/{ => nonplat}/adbd.te sepolicy/{ => nonplat}/audioserver.te sepolicy/{ => nonplat}/bootanim.te sepolicy/{ => nonplat}/cameraserver.te sepolicy/{ => nonplat}/device.te sepolicy/{ => nonplat}/domain.te sepolicy/{ => nonplat}/file.te sepolicy/{ => nonplat}/file_contexts sepolicy/{ => nonplat}/hal_camera_default.te sepolicy/{ => nonplat}/hal_cas_default.te sepolicy/{ => nonplat}/hal_drm_default.te sepolicy/{ => nonplat}/hal_drm_widevine.te sepolicy/{ => nonplat}/hal_gnss_default.te sepolicy/{ => nonplat}/hal_graphics_composer_default.te sepolicy/{ => nonplat}/healthd.te sepolicy/{ => nonplat}/init.te sepolicy/{ => nonplat}/installd.te sepolicy/{ => nonplat}/logpersist.te sepolicy/{ => nonplat}/mediacodec.te sepolicy/{ => nonplat}/netd.te sepolicy/{ => nonplat}/priv_app.te sepolicy/{ => nonplat}/property.te sepolicy/{ => nonplat}/property_contexts sepolicy/{ => nonplat}/shell.te sepolicy/{ => nonplat}/surfaceflinger.te sepolicy/{ => nonplat}/system_server.te sepolicy/{ => nonplat}/vold.te sepolicy/{ => nonplat}/zygote.te| @@ -87,5 +87,7 @@ ZIP_OPTIMIZATION_NO_INTEGRITY := true | ||
| 87 | 87 | |
| 88 | 88 | DEVICE_MANIFEST_FILE := device/generic/common/manifest.xml |
| 89 | 89 | |
| 90 | -BOARD_SEPOLICY_DIRS += device/generic/common/sepolicy \ | |
| 90 | +BOARD_SEPOLICY_DIRS += device/generic/common/sepolicy/nonplat \ | |
| 91 | 91 | system/bt/vendor_libs/linux/sepolicy \ |
| 92 | + | |
| 93 | +BOARD_PLAT_PRIVATE_SEPOLICY_DIR := device/generic/common/sepolicy/plat_private |
| @@ -13,6 +13,11 @@ urls[3]=http://tinyurl.com/y3nagyza | ||
| 13 | 13 | urls[4]=http://tinyurl.com/y6azmjas |
| 14 | 14 | urls[5]=http://tinyurl.com/y6g6cx27 |
| 15 | 15 | |
| 16 | +mount_sfs() | |
| 17 | +{ | |
| 18 | + mount -o 'context="u:object_r:system_file:s0"' $1 $2 | |
| 19 | +} | |
| 20 | + | |
| 16 | 21 | if [ -z "$1" ]; then |
| 17 | 22 | v=9_y |
| 18 | 23 | u=1 |
| @@ -24,7 +29,7 @@ fi | ||
| 24 | 29 | if [ -s /system/lib$1/libhoudini.so ]; then |
| 25 | 30 | log -pi -thoudini "found /system/lib$1/libhoudini.so" |
| 26 | 31 | elif [ -e /system/etc/houdini$v.sfs ]; then |
| 27 | - mount /system/etc/houdini$v.sfs $dest_dir | |
| 32 | + mount_sfs /system/etc/houdini$v.sfs $dest_dir | |
| 28 | 33 | else |
| 29 | 34 | if mountpoint -q $dest_dir; then |
| 30 | 35 | kill -9 `fuser -m $dest_dir` |
| @@ -32,7 +37,7 @@ else | ||
| 32 | 37 | fi |
| 33 | 38 | mkdir -p /data/arm |
| 34 | 39 | cd /data/arm |
| 35 | - while ! mount houdini$v.sfs $dest_dir; do | |
| 40 | + while ! mount_sfs houdini$v.sfs $dest_dir; do | |
| 36 | 41 | while [ "$(getprop net.dns1)" = "" ]; do |
| 37 | 42 | sleep 10 |
| 38 | 43 | done |
| @@ -0,0 +1,3 @@ | ||
| 1 | +# surfaceflinger | |
| 2 | +/dev/dri(/.*)? u:object_r:gpu_device:s0 | |
| 3 | +/dev/tty0 u:object_r:gpu_device:s0 |
| @@ -0,0 +1,24 @@ | ||
| 1 | +allow surfaceflinger surfaceflinger_tmpfs:file { map }; | |
| 2 | +allow surfaceflinger tmpfs:lnk_file { read }; | |
| 3 | +allow surfaceflinger self:capability { sys_tty_config }; | |
| 4 | + | |
| 5 | +allowxperm surfaceflinger gpu_device:chr_file ioctl { | |
| 6 | + 0x5605 | |
| 7 | + 0x6409 | |
| 8 | + 0x640a | |
| 9 | + 0x640b | |
| 10 | + 0x641e | |
| 11 | + 0x641f | |
| 12 | + 0x6457 | |
| 13 | + 0x6458 | |
| 14 | + 0x645b | |
| 15 | + 0x645e | |
| 16 | + 0x645f | |
| 17 | + 0x6461 | |
| 18 | + 0x6462 | |
| 19 | + 0x6469 | |
| 20 | + 0x6466 | |
| 21 | + 0x646c | |
| 22 | + 0x64a2 | |
| 23 | + 0x64b0 | |
| 24 | +}; |
| @@ -0,0 +1,2 @@ | ||
| 1 | +allow zygote surfaceflinger:binder call; | |
| 2 | +allow zygote surfaceflinger:unix_stream_socket { read }; |
Android-x86
Fork