wahoo: switch to IMapper 2.1
Test: Check system boots. Run display CTS.
Bug: 66876469
Change-Id: I33be48cd40457ceabc24ff5e085fa8ddaa4670e4
diff --git a/CleanSpec.mk b/CleanSpec.mk
index 7ec8359..3d36290 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -194,3 +194,7 @@
# Move libnfc-nci.conf to /vendor
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/etc/libnfc-nci.conf)
+
+# Remove android.hardware.graphics.mapper@2.0-impl
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/lib/hw/android.hardware.graphics.mapper@2.0-impl.so)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/lib64/hw/android.hardware.graphics.mapper@2.0-impl.so)
diff --git a/device.mk b/device.mk
index ee81f76..90ee19e 100755
--- a/device.mk
+++ b/device.mk
@@ -334,7 +334,7 @@
gralloc.msm8998 \
android.hardware.graphics.allocator@2.0-impl:64 \
android.hardware.graphics.allocator@2.0-service \
- android.hardware.graphics.mapper@2.0-impl \
+ android.hardware.graphics.mapper@2.0-impl-2.1 \
libbt-vendor
# RenderScript HAL
diff --git a/manifest.xml b/manifest.xml
index 6723c3e..a46b40e 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -136,7 +136,7 @@
<hal format="hidl">
<name>android.hardware.graphics.mapper</name>
<transport arch="32+64">passthrough</transport>
- <version>2.0</version>
+ <version>2.1</version>
<interface>
<name>IMapper</name>
<instance>default</instance>
diff --git a/sepolicy/vendor/file_contexts b/sepolicy/vendor/file_contexts
index 09005ce..20e29b1 100644
--- a/sepolicy/vendor/file_contexts
+++ b/sepolicy/vendor/file_contexts
@@ -196,6 +196,7 @@
###############################################
# same-process HAL files and their dependencies
#
+/vendor/lib(64)?/hw/android\.hardware\.graphics\.mapper@2\.0-impl-2\.1\.so u:object_r:same_process_hal_file:s0
/vendor/lib(64)?/hw/gralloc\.msm8998\.so u:object_r:same_process_hal_file:s0
/vendor/lib(64)?/libqdMetaData\.so u:object_r:same_process_hal_file:s0
/vendor/lib(64)?/libqservice\.so u:object_r:same_process_hal_file:s0
