floral: rev graphics.composer to 2.4
Move floral to composer 2.4 interface for the R api additions.
Test: boot, FOSS works, 2.4 composer is running
Test: VtsHalGraphicsComposerV2_4TargetTest
Change-Id: Ic3e78b7ff04802120765b04f782021b405d2494f
diff --git a/CleanSpec.mk b/CleanSpec.mk
index 6c84679..6fbd425 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -93,6 +93,10 @@
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/bin/hw/android.hardware.graphics.composer@2.3-service)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/etc/init/android.hardware.graphics.composer@2.3-service.rc)
+# Remove android.hardware.graphics.composer@2.3-service-sm8150
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/bin/hw/android.hardware.graphics.composer@2.3-service-sm8150)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/etc/init/android.hardware.graphics.composer@2.3-service-sm8150.rc)
+
# Remove obsolete android.hardware.boot@1.0-impl-wrapper.recovery.so
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/recovery/root/system/lib64/hw/android.hardware.boot@1.0-impl-wrapper.recovery.so)
diff --git a/device.mk b/device.mk
index 9c0ca59..8370e61 100644
--- a/device.mk
+++ b/device.mk
@@ -336,7 +336,7 @@
PRODUCT_PACKAGES += \
hwcomposer.msmnile \
- android.hardware.graphics.composer@2.3-service-sm8150 \
+ android.hardware.graphics.composer@2.4-service-sm8150 \
gralloc.msmnile \
android.hardware.graphics.mapper@3.0-impl-qti-display \
vendor.qti.hardware.display.allocator-service
diff --git a/init.hardware.rc b/init.hardware.rc
index bb06619..0f553b0 100644
--- a/init.hardware.rc
+++ b/init.hardware.rc
@@ -234,7 +234,7 @@
setprop ro.surface_flinger.display_primary_white ${vendor.display.primary_white}
start surfaceflinger
start bootanim
- start vendor.hwcomposer-2-3
+ start vendor.hwcomposer-2-4
start vendor.configstore-hal
start vendor.qti.hardware.display.allocator
start vendor.light-1-1
@@ -774,10 +774,10 @@
on property:persist.vendor.sys.ssr.enable_ramdumps=0
write /sys/module/subsystem_restart/parameters/enable_ramdumps 0
-on property:init.svc.vendor.hwcomposer-2-3=stopped
+on property:init.svc.vendor.hwcomposer-2-4=stopped
stop ppd
-on property:init.svc.vendor.hwcomposer-2-3=running
+on property:init.svc.vendor.hwcomposer-2-4=running
start ppd
service insmod_sh /vendor/bin/init.insmod.sh /vendor/etc/init.insmod.${ro.hardware}.cfg
diff --git a/manifest.xml b/manifest.xml
index e657b23..09f3af1 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -177,7 +177,7 @@
<name>android.hardware.graphics.composer</name>
<transport>hwbinder</transport>
<impl level="generic"></impl>
- <version>2.3</version>
+ <version>2.4</version>
<interface>
<name>IComposer</name>
<instance>default</instance>
