composer: link graphics.composer to 2.4
Links sm8150 devices graphics.composer to composer@2.4 interface
for the R api additions. Also upgrade composer@2.3-service-sm8150
to composer@2.4-service-sm8150.
Test: boot, FOSS works, 2.4 composer is running
Test: VtsHalGraphicsComposerV2_4TargetTest
Change-Id: I029b1c3ccd327b7408e51a0051796adc26c82a21
diff --git a/composer/Android.bp b/composer/Android.bp
index fa7ad68..a1e8577 100644
--- a/composer/Android.bp
+++ b/composer/Android.bp
@@ -15,20 +15,21 @@
//
cc_binary {
- name: "android.hardware.graphics.composer@2.3-service-sm8150",
+ name: "android.hardware.graphics.composer@2.4-service-sm8150",
defaults: ["hidl_defaults"],
vendor: true,
relative_install_path: "hw",
srcs: ["service.cpp"],
- init_rc: ["android.hardware.graphics.composer@2.3-service-sm8150.rc"],
+ init_rc: ["android.hardware.graphics.composer@2.4-service-sm8150.rc"],
header_libs: [
- "android.hardware.graphics.composer@2.3-passthrough",
+ "android.hardware.graphics.composer@2.4-passthrough",
],
shared_libs: [
"android.hardware.graphics.composer@2.1",
"android.hardware.graphics.composer@2.1-resources",
"android.hardware.graphics.composer@2.2",
"android.hardware.graphics.composer@2.3",
+ "android.hardware.graphics.composer@2.4",
"android.hardware.graphics.mapper@2.0",
"android.hardware.graphics.mapper@3.0",
"libbase",
diff --git a/composer/android.hardware.graphics.composer@2.3-service-sm8150.rc b/composer/android.hardware.graphics.composer@2.4-service-sm8150.rc
similarity index 63%
rename from composer/android.hardware.graphics.composer@2.3-service-sm8150.rc
rename to composer/android.hardware.graphics.composer@2.4-service-sm8150.rc
index b8781da..caf2aa5 100644
--- a/composer/android.hardware.graphics.composer@2.3-service-sm8150.rc
+++ b/composer/android.hardware.graphics.composer@2.4-service-sm8150.rc
@@ -1,4 +1,4 @@
-service vendor.hwcomposer-2-3 /vendor/bin/hw/android.hardware.graphics.composer@2.3-service-sm8150
+service vendor.hwcomposer-2-4 /vendor/bin/hw/android.hardware.graphics.composer@2.4-service-sm8150
class hal animation
user system
group graphics drmrpc
diff --git a/composer/service.cpp b/composer/service.cpp
index 0e9a99f..98dac3e 100644
--- a/composer/service.cpp
+++ b/composer/service.cpp
@@ -16,13 +16,13 @@
#include <sched.h>
-#include <android/hardware/graphics/composer/2.3/IComposer.h>
+#include <android/hardware/graphics/composer/2.4/IComposer.h>
#include <binder/ProcessState.h>
-#include <composer-passthrough/2.3/HwcLoader.h>
+#include <composer-passthrough/2.4/HwcLoader.h>
#include <hidl/HidlTransportSupport.h>
-using android::hardware::graphics::composer::V2_3::IComposer;
-using android::hardware::graphics::composer::V2_3::passthrough::HwcLoader;
+using android::hardware::graphics::composer::V2_4::IComposer;
+using android::hardware::graphics::composer::V2_4::passthrough::HwcLoader;
int main() {
// the conventional HAL might start binder services
