Detect HIDL gralloc4

diff --git a/tools/helpers/lxc.py b/tools/helpers/lxc.py
index 8cacfe25ccee0b9497814c9d8b790516a7e6ab70..a099801de4667a47e167d6f8f1809511a9b45ddf 100644 (file)
--- a/tools/helpers/lxc.py
+++ b/tools/helpers/lxc.py
@@ -7,6 +7,7 @@ import logging
 import glob
 import shutil
 import platform
 import glob
 import shutil
 import platform

+import gbinder

 import tools.config
 import tools.helpers.run
 
 import tools.config
 import tools.helpers.run
 


@@ -171,6 +172,16 @@ def make_base_props(args):
                         return prop
         return ""
 
                         return prop
         return ""
 

+    def find_hidl(intf):
+        if args.vendor_type == "MAINLINE":
+            return False
+
+        try:
+            sm = gbinder.ServiceManager("/dev/hwbinder")
+            return intf in sm.list_sync()
+        except:
+            return False
+

     props = []
 
     if not os.path.exists("/dev/ashmem"):
     props = []
 
     if not os.path.exists("/dev/ashmem"):


@@ -180,7 +191,10 @@ def make_base_props(args):
     dri = tools.helpers.gpu.getDriNode(args)
 
     gralloc = find_hal("gralloc")
     dri = tools.helpers.gpu.getDriNode(args)
 
     gralloc = find_hal("gralloc")

-    if gralloc == "":
+    if not gralloc:
+        if find_hidl("android.hardware.graphics.allocator@4.0::IAllocator/default"):
+            gralloc = "android"
+    if not gralloc:

         if dri:
             gralloc = "gbm"
             egl = "mesa"
         if dri:
             gralloc = "gbm"
             egl = "mesa"