summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimi Rautamäki <timi.rautamaki@gmail.com>2021-09-23 07:12:34 +0000
committerTimi Rautamäki <timi.rautamaki@gmail.com>2021-09-27 10:52:01 +0000
commitc3667a90967008ed0f1d5dd42f5ff0d54475bbc9 (patch)
tree0b52fc59888316951c10161d680585bb0787b58e
parent43e148d42e8238ae07731616737db08ba76657a8 (diff)
dumpling: build touch
* Oneplus-common touch is now in hardware/oneplus. * Remove old manifest related to Oneplus-msm8998-specific touch. * Bring in sepolicy rule for touch. Change-Id: I61c32f106f9427a7632e6c28d1a814ecd9b230b7
-rw-r--r--BoardConfig.mk2
-rw-r--r--device.mk4
-rw-r--r--manifest.xml11
-rw-r--r--sepolicy/vendor/file_contexts3
4 files changed, 7 insertions, 13 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 2c11b1e..40eabb0 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -36,5 +36,3 @@ BOARD_SEPOLICY_DIRS += $(DEVICE_PATH)/sepolicy/vendor
# inherit from the proprietary version
-include vendor/oneplus/dumpling/BoardConfigVendor.mk
-
-DEVICE_MANIFEST_FILE += $(DEVICE_PATH)/manifest.xml
diff --git a/device.mk b/device.mk
index 5c7db80..cc742e2 100644
--- a/device.mk
+++ b/device.mk
@@ -47,5 +47,9 @@ PRODUCT_COPY_FILES += \
PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/keylayout/gf_input.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/gf_input.kl
+# Touch
+PRODUCT_PACKAGES += \
+ vendor.lineage.touch@1.0-service.oneplus
+
# Inherit from oneplus msm8998-common
$(call inherit-product, device/oneplus/msm8998-common/common.mk)
diff --git a/manifest.xml b/manifest.xml
deleted file mode 100644
index a1f3b91..0000000
--- a/manifest.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<manifest version="1.0" type="device" target-level="3">
- <hal format="hidl">
- <name>vendor.lineage.touch</name>
- <transport>hwbinder</transport>
- <version>1.0</version>
- <interface>
- <name>ITouchscreenGesture</name>
- <instance>default</instance>
- </interface>
- </hal>
-</manifest>
diff --git a/sepolicy/vendor/file_contexts b/sepolicy/vendor/file_contexts
index 2b97426..2c2109b 100644
--- a/sepolicy/vendor/file_contexts
+++ b/sepolicy/vendor/file_contexts
@@ -1,3 +1,6 @@
# Fingerprint
/dev/goodix_fp u:object_r:fingerprint_device:s0
/sys/devices/soc/soc:goodix_fp/proximity_state u:object_r:sysfs_fpc_proximity:s0
+
+# Touch
+/(vendor|system/vendor)/bin/hw/vendor\.lineage\.touch@1\.0-service\.oneplus u:object_r:hal_touch_oneplus_msm8998_exec:s0