commit 430d0510e6ada9fdbed7dcdd9d70d8bb1208c855
author bohu <bohu@google.com> Tue Mar 28 14:54:16 2017 -0700
committer Jeff Tinker <jtinker@google.com> Tue Mar 28 22:11:04 2017 +0000
tree c5d69b711e4548d7637bf6a526cdb7f49e98422d
parent ec5f0780e1b9362c83da01d6cafaefc317f3fe3e

Revert "Fix build after ag/2001747 breakage."

This reverts commit 2b3b590ff62c432c93d006767409f93ed2c6e53f.

This change is being reverted because it broke the git_master build
for full-eng and other targets.

automotive/vehicle/2.0/default/Android.mk

diff --git a/automotive/vehicle/2.0/default/Android.mk b/automotive/vehicle/2.0/default/Android.mk
index 9c877a7..4a010e9 100644
--- a/automotive/vehicle/2.0/default/Android.mk
+++ b/automotive/vehicle/2.0/default/Android.mk
@@ -99,7 +99,6 @@
     $(vhal_v2_0) \
 
 LOCAL_STATIC_LIBRARIES := \
-    libqemu_pipe \
     $(vhal_v2_0)-libproto-native \
 
 LOCAL_CFLAGS += -Wall -Wextra -Werror
@@ -167,7 +166,6 @@
     $(vhal_v2_0)-manager-lib \
     $(vhal_v2_0)-default-impl-lib \
     $(vhal_v2_0)-libproto-native \
-    libqemu_pipe \
 
 LOCAL_CFLAGS += -Wall -Wextra -Werror
 

automotive/vehicle/2.0/default/impl/vhal_v2_0/PipeComm.cpp

diff --git a/automotive/vehicle/2.0/default/impl/vhal_v2_0/PipeComm.cpp b/automotive/vehicle/2.0/default/impl/vhal_v2_0/PipeComm.cpp
index 4da59a9..6f219fa 100644
--- a/automotive/vehicle/2.0/default/impl/vhal_v2_0/PipeComm.cpp
+++ b/automotive/vehicle/2.0/default/impl/vhal_v2_0/PipeComm.cpp
@@ -18,7 +18,7 @@
 
 #include <android/hardware/automotive/vehicle/2.0/IVehicle.h>
 #include <android/log.h>
-#include <qemu_pipe.h>
+#include <system/qemu_pipe.h>
 
 #include "PipeComm.h"