From fbcb5a89c91b2bb4a8b27c88338cae35cc973d90 Mon Sep 17 00:00:00 2001 From: Naseer Ahmed Date: Tue, 23 Jun 2020 16:31:44 -0400 Subject: [PATCH] Do not link mapper libraries statically Linking them statically prevents the mapper SP HAL from being extended Bug: 158465474 Test: local build vts tools. Passed on VtsHalGraphicsComposerV2_XTargetTest. Change-Id: I916b1c042b1e81e53f7398cd4a1a2231469ea91f --- graphics/composer/2.1/vts/functional/Android.bp | 8 ++++---- graphics/composer/2.2/vts/functional/Android.bp | 8 ++++---- graphics/composer/2.3/vts/functional/Android.bp | 8 ++++---- graphics/composer/2.4/vts/functional/Android.bp | 8 ++++---- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/graphics/composer/2.1/vts/functional/Android.bp b/graphics/composer/2.1/vts/functional/Android.bp index dafbbf9c9e..e137afb27a 100644 --- a/graphics/composer/2.1/vts/functional/Android.bp +++ b/graphics/composer/2.1/vts/functional/Android.bp @@ -23,6 +23,10 @@ cc_test { shared_libs: [ "libfmq", "libsync", + "android.hardware.graphics.mapper@2.0", + "android.hardware.graphics.mapper@2.1", + "android.hardware.graphics.mapper@3.0", + "android.hardware.graphics.mapper@4.0", ], static_libs: [ "android.hardware.graphics.allocator@2.0", @@ -30,13 +34,9 @@ cc_test { "android.hardware.graphics.allocator@4.0", "android.hardware.graphics.composer@2.1", "android.hardware.graphics.composer@2.1-vts", - "android.hardware.graphics.mapper@2.0", "android.hardware.graphics.mapper@2.0-vts", - "android.hardware.graphics.mapper@2.1", "android.hardware.graphics.mapper@2.1-vts", - "android.hardware.graphics.mapper@3.0", "android.hardware.graphics.mapper@3.0-vts", - "android.hardware.graphics.mapper@4.0", "android.hardware.graphics.mapper@4.0-vts", ], header_libs: [ diff --git a/graphics/composer/2.2/vts/functional/Android.bp b/graphics/composer/2.2/vts/functional/Android.bp index e1a254dee4..d80845f9dd 100644 --- a/graphics/composer/2.2/vts/functional/Android.bp +++ b/graphics/composer/2.2/vts/functional/Android.bp @@ -33,6 +33,10 @@ cc_test { "libprocessgroup", "libsync", "libui", + "android.hardware.graphics.mapper@2.0", + "android.hardware.graphics.mapper@2.1", + "android.hardware.graphics.mapper@3.0", + "android.hardware.graphics.mapper@4.0", ], static_libs: [ "android.hardware.graphics.allocator@2.0", @@ -43,13 +47,9 @@ cc_test { "android.hardware.graphics.composer@2.1-vts", "android.hardware.graphics.composer@2.2", "android.hardware.graphics.composer@2.2-vts", - "android.hardware.graphics.mapper@2.0", "android.hardware.graphics.mapper@2.0-vts", - "android.hardware.graphics.mapper@2.1", "android.hardware.graphics.mapper@2.1-vts", - "android.hardware.graphics.mapper@3.0", "android.hardware.graphics.mapper@3.0-vts", - "android.hardware.graphics.mapper@4.0", "android.hardware.graphics.mapper@4.0-vts", "libgtest", "librenderengine", diff --git a/graphics/composer/2.3/vts/functional/Android.bp b/graphics/composer/2.3/vts/functional/Android.bp index 18ea2aa96c..1ab6b3b88d 100644 --- a/graphics/composer/2.3/vts/functional/Android.bp +++ b/graphics/composer/2.3/vts/functional/Android.bp @@ -24,6 +24,10 @@ cc_test { "libfmq", "libhidlbase", "libsync", + "android.hardware.graphics.mapper@2.0", + "android.hardware.graphics.mapper@2.1", + "android.hardware.graphics.mapper@3.0", + "android.hardware.graphics.mapper@4.0", ], static_libs: [ "android.hardware.graphics.allocator@2.0", @@ -35,13 +39,9 @@ cc_test { "android.hardware.graphics.composer@2.2-vts", "android.hardware.graphics.composer@2.3", "android.hardware.graphics.composer@2.3-vts", - "android.hardware.graphics.mapper@2.0", "android.hardware.graphics.mapper@2.0-vts", - "android.hardware.graphics.mapper@2.1", "android.hardware.graphics.mapper@2.1-vts", - "android.hardware.graphics.mapper@3.0", "android.hardware.graphics.mapper@3.0-vts", - "android.hardware.graphics.mapper@4.0", "android.hardware.graphics.mapper@4.0-vts", ], header_libs: [ diff --git a/graphics/composer/2.4/vts/functional/Android.bp b/graphics/composer/2.4/vts/functional/Android.bp index 9e7cc46c56..d0209b7af3 100644 --- a/graphics/composer/2.4/vts/functional/Android.bp +++ b/graphics/composer/2.4/vts/functional/Android.bp @@ -23,6 +23,10 @@ cc_test { shared_libs: [ "libfmq", "libsync", + "android.hardware.graphics.mapper@2.0", + "android.hardware.graphics.mapper@2.1", + "android.hardware.graphics.mapper@3.0", + "android.hardware.graphics.mapper@4.0", ], static_libs: [ "android.hardware.graphics.allocator@2.0", @@ -36,13 +40,9 @@ cc_test { "android.hardware.graphics.composer@2.3-vts", "android.hardware.graphics.composer@2.4", "android.hardware.graphics.composer@2.4-vts", - "android.hardware.graphics.mapper@2.0", "android.hardware.graphics.mapper@2.0-vts", - "android.hardware.graphics.mapper@2.1", "android.hardware.graphics.mapper@2.1-vts", - "android.hardware.graphics.mapper@3.0", "android.hardware.graphics.mapper@3.0-vts", - "android.hardware.graphics.mapper@4.0", "android.hardware.graphics.mapper@4.0-vts", ], header_libs: [