Merge "Enable computepipe for crosshatch_car" into rvc-dev am: cb97a1bab7

Change-Id: Iac97da170319df1be9d3192c3de16b5dfd06d70d
diff --git a/crosshatch_car/device-crosshatch-car.mk b/crosshatch_car/device-crosshatch-car.mk
index 5fc016a..007fd1c 100644
--- a/crosshatch_car/device-crosshatch-car.mk
+++ b/crosshatch_car/device-crosshatch-car.mk
@@ -18,6 +18,7 @@
 
 $(call inherit-product, packages/services/Car/car_product/build/car.mk)
 include device/google_car/crosshatch_car/device-common.mk
+include packages/services/Car/computepipe/products/computepipe.mk
 
 PRODUCT_COPY_FILES += \
     device/google/crosshatch/init.insmod.crosshatch.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/init.insmod.cfg
diff --git a/crosshatch_car/manifest.xml b/crosshatch_car/manifest.xml
index 0802c49..29df885 100644
--- a/crosshatch_car/manifest.xml
+++ b/crosshatch_car/manifest.xml
@@ -52,4 +52,15 @@
             <instance>dab</instance>
         </interface>
     </hal>
+   <hal format="aidl" optional="true">
+       <name>android.automotive.computepipe.registry</name>
+       <interface>
+           <name>IPipeQuery</name>
+           <instance>router</instance>
+       </interface>
+       <interface>
+           <name>IPipeRegistration</name>
+           <instance>router</instance>
+       </interface>
+   </hal>
 </manifest>