commit 87551225ede71b5b64cd3bf14ed0d0daca2be356
author Courtney Goeltzenleuchter <courtneygo@google.com> Tue Jan 16 14:00:09 2018 -0800
committer Courtney Goeltzenleuchter <courtneygo@google.com> Fri Jan 19 14:12:33 2018 -0800
tree 6af407cc53bfcf2794f66aeae28cabc70c7eed5d
parent 5e92144cbd03008636016d543d5ae620e9b2f65a

Update hwcomposer include paths

In preparation of new hwcomposer interface, updating
existing includes to include specific version.
Bug: 71513561
Test: compile

Change-Id: Iab13368f782067f255f7dee5318bfd57872f30dd

services/vr/hardware_composer/Android.bp

diff --git a/services/vr/hardware_composer/Android.bp b/services/vr/hardware_composer/Android.bp
index 76ec42d..063d83c 100644
--- a/services/vr/hardware_composer/Android.bp
+++ b/services/vr/hardware_composer/Android.bp
@@ -32,6 +32,10 @@
     "libutils",
   ],
 
+  header_libs: [
+    "android.hardware.graphics.composer@2.1-command-buffer",
+  ],
+
   export_static_lib_headers: [
     "libhwcomposer-client",
   ],

services/vr/hardware_composer/impl/vr_composer_client.h

diff --git a/services/vr/hardware_composer/impl/vr_composer_client.h b/services/vr/hardware_composer/impl/vr_composer_client.h
index dfc656a..63ee86f 100644
--- a/services/vr/hardware_composer/impl/vr_composer_client.h
+++ b/services/vr/hardware_composer/impl/vr_composer_client.h
@@ -17,9 +17,9 @@
 #ifndef ANDROID_DVR_HARDWARE_COMPOSER_IMPL_VR_COMPOSER_CLIENT_H
 #define ANDROID_DVR_HARDWARE_COMPOSER_IMPL_VR_COMPOSER_CLIENT_H
 
-#include <android/frameworks/vr/composer/1.0/IVrComposerClient.h>
 #include <ComposerClient.h>
-#include <IComposerCommandBuffer.h>
+#include <android/frameworks/vr/composer/1.0/IVrComposerClient.h>
+#include <composer-command-buffer/2.1/ComposerCommandBuffer.h>
 
 namespace android {
 namespace dvr {