Use libvulkan for platform variant of deqp_amberandroid-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12android11-mainline-tethering-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-releaseandroid11-dev

The SDK variant of deqp_amber doesn't need libvulkan, as the
headers are always visible through the NDK.  When the build
system is changed to also create a platform variant then
a dependency on libvulkan will be necessary to see the
headers.  Also reexport the headers to be visible to
libdeqp.

Bug: 149591340
Test: m checkbuild
Change-Id: I22cc9c2cea9e7aef7bcfc343c95e522b26ec6638
Merged-In: I22cc9c2cea9e7aef7bcfc343c95e522b26ec6638
(cherry picked from commit 2a5dd60b2876104b5eb827188acc2a13310739bf)

1 files changed, 2 insertions, 0 deletions

diff --git a/Android.bp b/Android.bp
index 9e763a9..cb2230e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -12,6 +12,8 @@ cc_defaults {
     rtti: false,
     sdk_version: "27",
     stl: "libc++_static",
+    shared_libs: ["libvulkan"],
+    export_shared_lib_headers: ["libvulkan"],
 }
 
 cc_library_static {