universal7904: Switch to new AIDL memtrack HAL
Change-Id: I3ae077b5f59e4fcf32489eef64bce8551d758998
diff --git a/manifest.xml b/manifest.xml
index 42fe7e0..6c120b0 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -106,15 +106,6 @@
</interface>
</hal>
<hal format="hidl">
- <name>android.hardware.memtrack</name>
- <transport>hwbinder</transport>
- <version>1.0</version>
- <interface>
- <name>IMemtrack</name>
- <instance>default</instance>
- </interface>
- </hal>
- <hal format="hidl">
<name>android.hardware.radio</name>
<transport>hwbinder</transport>
<fqname>@1.2::ISap/slot1</fqname>
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 7f2b602..997140a 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -105,10 +105,6 @@
vendor/etc/media_profiles_V1_0.xml
vendor/firmware/mfc_fw.bin
-# Memtrack
--vendor/lib/hw/memtrack.exynos7904.so
--vendor/lib64/hw/memtrack.exynos7904.so
-
# OMX
-vendor/lib/libExynosOMX_Core.so
-vendor/lib/libExynosOMX_Resourcemanager.so
diff --git a/sepolicy/vendor/genfs_contexts b/sepolicy/vendor/genfs_contexts
index 93afcb4..5321960 100644
--- a/sepolicy/vendor/genfs_contexts
+++ b/sepolicy/vendor/genfs_contexts
@@ -7,6 +7,9 @@
genfscon sysfs /class/input/input1 u:object_r:sysfs_input:s0
genfscon sysfs /class/video4linux u:object_r:sysfs_v4l:s0
genfscon sysfs /devices/platform/10000.mif_pdata/sim/ds_detect u:object_r:sysfs_sim_writable:s0
+genfscon sysfs /devices/platform/11500000.mali/dma_buf_gpu_mem u:object_r:sysfs_gpu:s0
+genfscon sysfs /devices/platform/11500000.mali/kprcs u:object_r:sysfs_gpu:s0
+genfscon sysfs /devices/platform/11500000.mali/total_gpu_mem u:object_r:sysfs_gpu:s0
genfscon sysfs /devices/platform/11ce0000.speedy/i2c-6/6-0000/s2mpu08-rtc/rtc u:object_r:sysfs_rtc:s0
genfscon sysfs /devices/platform/11ce0000.speedy/i2c-7/7-0000/s2mpu08-rtc/rtc u:object_r:sysfs_rtc:s0
genfscon sysfs /devices/platform/11ce0000.speedy/i2c-7/7-0003/input/input11 u:object_r:sysfs_touchscreen_writable:s0
diff --git a/sepolicy/vendor/hal_memtrack_default.te b/sepolicy/vendor/hal_memtrack_default.te
index 67b2c61..22f0184 100644
--- a/sepolicy/vendor/hal_memtrack_default.te
+++ b/sepolicy/vendor/hal_memtrack_default.te
@@ -1,4 +1,3 @@
r_dir_file(hal_memtrack_default, debugfs_ion);
r_dir_file(hal_memtrack_default, debugfs_mali_mem);
-
-allow hal_memtrack_default sysfs_gpu:file { getattr open read };
+r_dir_file(hal_memtrack_default, sysfs_gpu)
diff --git a/universal7904-common.mk b/universal7904-common.mk
index 7fd68f7..828d645 100644
--- a/universal7904-common.mk
+++ b/universal7904-common.mk
@@ -123,8 +123,7 @@
# Memtrack
PRODUCT_PACKAGES += \
- android.hardware.memtrack@1.0-impl \
- android.hardware.memtrack@1.0-service
+ android.hardware.memtrack-service.samsung-mali
# NFC
PRODUCT_PACKAGES += \