[vulkan] Link statically against most libraries.
Fuchsia vulkan ICDs need to link statically against all libraries
except libfdio and libasync-default. Also get vulkan headers from
external/vulkan-headers when using Android.bp to build for Fuchsia.
This also improves the name of GN target so it works with the
latest GN files in Fuchsia tree and matches other ICDs.
Change-Id: If2cb8cc1ae9cdbdd389d502be9d67dd95d15724a
diff --git a/Android.bp b/Android.bp
index 7d01237..717e745 100644
--- a/Android.bp
+++ b/Android.bp
@@ -46,7 +46,7 @@
],
include_dirs: [
- "external/qemu/android/android-emugl/host/include",
+ "external/vulkan-headers/include",
],
local_include_dirs: [
@@ -78,13 +78,16 @@
"-DGOLDFISH_ADDRESS_SPACE_DEVICE_NAME=\"/dev/class/goldfish-address-space/000\"",
],
+ stl: "libc++_static",
+
local_include_dirs: [
"fuchsia/include",
],
- shared_libs: [
- "libfdio",
+ static_libs: [
+ "libasync",
"libfidl",
+ "libfidl_base",
"libfidl_cpp",
"libfidl_cpp_base",
"libfidl_cpp_sync",
@@ -95,6 +98,11 @@
"libzx",
],
+ shared_libs: [
+ "libasync-default",
+ "libfdio",
+ ],
+
required: [
"libzircon",
],
diff --git a/BUILD.gn b/BUILD.gn
index 9e48712..ccb8fe2 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -1,4 +1,4 @@
-shared_library("vulkan_goldfish") {
+shared_library("libvulkan_goldfish") {
sources = [
"android-emu/android/base/AlignedBuf.cpp",
"android-emu/android/base/AlignedBuf.h",
