Add all layer libs to apk

Apk requires all layer libs to be able to run them

Components: Framework
VK-GL-CTS issue: 4323

Change-Id: Ib5e06cc931ac27131464e003d68fc25f3adbfd52

diff --git a/scripts/android/build_apk.py b/scripts/android/build_apk.py
index b39d4b7..f721f51 100644 (file)
--- a/scripts/android/build_apk.py
+++ b/scripts/android/build_apk.py
@@ -769,7 +769,8 @@ class AddNativeLibsToAPK (BuildStep):
                        libFiles.append(libRelPath)
 
                        if config.layers:
-                               layersGlob = os.path.join(config.layers, abi, "libVkLayer_*.so")
+                               # Need to copy everything in the layer folder
+                               layersGlob = os.path.join(config.layers, abi, "*")
                                libVkLayers = glob.glob(layersGlob)
                                for layer in libVkLayers:
                                        layerFilename = os.path.basename(layer)