Commit: fd32cdb5c6aed3e3f755f79e6ffd50da03832790 - device-generic-common (git)

device/generic/common

Commit MetaInfo

• Revision: fd32cdb5c6aed3e3f755f79e6ffd50da03832790 (tree)
• Time: 2019-10-16 19:25:41
• Author: Chih-Wei Huang <cwhuang@linu...>
• Commiter: Chih-Wei Huang

Log Message

Merge remote-tracking branch 'x86/pie-x86' into q-x86

Change Summary

• modified: BoardConfig.mk
• modified: app/TermOnePlus.apk
• modified: build/tasks/kernel.mk
• modified: init.sh
• modified: nativebridge/bin/enable_nativebridge
• add: sepolicy/plat_private/file_contexts
• add: sepolicy/plat_private/surfaceflinger.te
• add: sepolicy/plat_private/zygote.te
• delete: sepolicy/{ => nonplat}/adbd.te
• delete: sepolicy/{ => nonplat}/audioserver.te
• delete: sepolicy/{ => nonplat}/bootanim.te
• delete: sepolicy/{ => nonplat}/cameraserver.te
• delete: sepolicy/{ => nonplat}/device.te
• delete: sepolicy/{ => nonplat}/domain.te
• delete: sepolicy/{ => nonplat}/file.te
• delete: sepolicy/{ => nonplat}/file_contexts
• delete: sepolicy/{ => nonplat}/hal_camera_default.te
• delete: sepolicy/{ => nonplat}/hal_cas_default.te
• delete: sepolicy/{ => nonplat}/hal_drm_default.te
• delete: sepolicy/{ => nonplat}/hal_drm_widevine.te
• delete: sepolicy/{ => nonplat}/hal_gnss_default.te
• delete: sepolicy/{ => nonplat}/hal_graphics_composer_default.te
• delete: sepolicy/{ => nonplat}/healthd.te
• delete: sepolicy/{ => nonplat}/init.te
• delete: sepolicy/{ => nonplat}/installd.te
• delete: sepolicy/{ => nonplat}/logpersist.te
• delete: sepolicy/{ => nonplat}/mediacodec.te
• delete: sepolicy/{ => nonplat}/netd.te
• delete: sepolicy/{ => nonplat}/priv_app.te
• delete: sepolicy/{ => nonplat}/property.te
• delete: sepolicy/{ => nonplat}/property_contexts
• delete: sepolicy/{ => nonplat}/shell.te
• delete: sepolicy/{ => nonplat}/surfaceflinger.te
• delete: sepolicy/{ => nonplat}/system_server.te
• delete: sepolicy/{ => nonplat}/vold.te
• delete: sepolicy/{ => nonplat}/zygote.te

Incremental Difference

--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -87,5 +87,7 @@ ZIP_OPTIMIZATION_NO_INTEGRITY := true
 
 DEVICE_MANIFEST_FILE := device/generic/common/manifest.xml
 
-BOARD_SEPOLICY_DIRS += device/generic/common/sepolicy \
+BOARD_SEPOLICY_DIRS += device/generic/common/sepolicy/nonplat \
                        system/bt/vendor_libs/linux/sepolicy \
+
+BOARD_PLAT_PRIVATE_SEPOLICY_DIR := device/generic/common/sepolicy/plat_private

Binary files a/app/TermOnePlus.apk and b/app/TermOnePlus.apk differ

--- a/build/tasks/kernel.mk
+++ b/build/tasks/kernel.mk
@@ -105,14 +105,6 @@ endif
 
 $(BUILT_SYSTEMIMAGE): $(KERNEL_MODULES_DEP)
 
-# rules to get source of Broadcom 802.11a/b/g/n hybrid device driver
-# based on broadcomsetup.sh of Kyle Evans
-WL_PATH := $(KERNEL_DIR)/drivers/net/wireless/broadcom/wl
-ifeq ($(wildcard $(WL_PATH)/build.mk),)
-WL_PATH := $(KERNEL_DIR)/drivers/net/wireless/wl
-endif
--include $(WL_PATH)/build.mk
-
 installclean: FILES += $(KBUILD_OUTPUT) $(INSTALLED_KERNEL_TARGET)
 
 TARGET_PREBUILT_KERNEL := $(BUILT_KERNEL_TARGET)

--- a/init.sh
+++ b/init.sh
@@ -321,6 +321,9 @@ function init_hal_sensors()
 			set_property ro.iio.accel.x.opt_scale -1
 			set_property ro.iio.accel.y.opt_scale -1
 			;;
+		*SP111-33*)
+			set_property ro.iio.accel.quirks no-trig
+			;&
 		*ST70416-6*)
 			set_property ro.iio.accel.order 102
 			;;

--- a/nativebridge/bin/enable_nativebridge
+++ b/nativebridge/bin/enable_nativebridge
@@ -13,6 +13,11 @@ urls[3]=http://tinyurl.com/y3nagyza
 urls[4]=http://tinyurl.com/y6azmjas
 urls[5]=http://tinyurl.com/y6g6cx27
 
+mount_sfs()
+{
+	mount -o 'context="u:object_r:system_file:s0"' $1 $2
+}
+
 if [ -z "$1" ]; then
 	v=9_y
 	u=1
@@ -24,7 +29,7 @@ fi
 if [ -s /system/lib$1/libhoudini.so ]; then
 	log -pi -thoudini "found /system/lib$1/libhoudini.so"
 elif [ -e /system/etc/houdini$v.sfs ]; then
-	mount /system/etc/houdini$v.sfs $dest_dir
+	mount_sfs /system/etc/houdini$v.sfs $dest_dir
 else
 	if mountpoint -q $dest_dir; then
 		kill -9 `fuser -m $dest_dir`
@@ -32,7 +37,7 @@ else
 	fi
 	mkdir -p /data/arm
 	cd /data/arm
-	while ! mount houdini$v.sfs $dest_dir; do
+	while ! mount_sfs houdini$v.sfs $dest_dir; do
 		while [ "$(getprop net.dns1)" = "" ]; do
 			sleep 10
 		done

--- /dev/null
+++ b/sepolicy/plat_private/file_contexts
@@ -0,0 +1,3 @@
+# surfaceflinger
+/dev/dri(/.*)?               u:object_r:gpu_device:s0
+/dev/tty0                    u:object_r:gpu_device:s0

--- /dev/null
+++ b/sepolicy/plat_private/surfaceflinger.te
@@ -0,0 +1,24 @@
+allow surfaceflinger surfaceflinger_tmpfs:file { map };
+allow surfaceflinger tmpfs:lnk_file { read };
+allow surfaceflinger self:capability { sys_tty_config };
+
+allowxperm surfaceflinger gpu_device:chr_file ioctl {
+	0x5605
+	0x6409
+	0x640a
+	0x640b
+	0x641e
+	0x641f
+	0x6457
+	0x6458
+	0x645b
+	0x645e
+	0x645f
+	0x6461
+	0x6462
+	0x6469
+	0x6466
+	0x646c
+	0x64a2
+	0x64b0
+};

--- /dev/null
+++ b/sepolicy/plat_private/zygote.te
@@ -0,0 +1,2 @@
+allow zygote surfaceflinger:binder call;
+allow zygote surfaceflinger:unix_stream_socket { read };