diff options
| author | Yilong Li <liyl@google.com> | 2022-06-23 14:26:53 -0700 |
|---|---|---|
| committer | Yilong Li <liyl@google.com> | 2022-06-23 14:26:53 -0700 |
| commit | 20ffe9ce466883683307889aac37c663d1660f8b (patch) | |
| tree | 27bdd0b25d15f643c5df26ad2e5524a249769008 | |
| parent | 90ffa1c4bf9767fcdf503483cd97dcfc460a4c30 (diff) | |
| download | goldfish-opengl-20ffe9ce466883683307889aac37c663d1660f8b.tar.gz | |
fuchsia: Remove fdio and libasync-default dependency.
These shared libraries are now allowed to use in Vulkan ICDs
and they are not being used, so it is safe to remove them.
Bug: fxbug.dev/103295
Change-Id: I38bdd80060cb6062b9f1f8822df70b394a7d9744
| -rw-r--r-- | BUILD.gn | 9 | ||||
| -rw-r--r-- | system/OpenglSystemCommon/TraceProviderFuchsia.cpp | 2 |
2 files changed, 7 insertions, 4 deletions
@@ -168,11 +168,9 @@ shared_library("libvulkan_goldfish") { "//sdk/fidl/fuchsia.hardware.goldfish:fuchsia.hardware.goldfish_llcpp", "//sdk/fidl/fuchsia.logger:fuchsia.logger_llcpp", "//sdk/fidl/fuchsia.sysmem:fuchsia.sysmem_llcpp", - "//sdk/lib/fdio", "//src/zircon/lib/zircon", "//zircon/public/lib/async-cpp", "//zircon/public/lib/zx", - "//zircon/system/ulib/async-default", "//zircon/system/ulib/async-loop:async-loop-cpp", "//zircon/system/ulib/syslog:syslog-static", "//zircon/system/ulib/trace:trace-with-static-engine", @@ -180,6 +178,13 @@ shared_library("libvulkan_goldfish") { "//zircon/system/ulib/zxio", ] + # Vulkan ICDs on Fuchsia are only allowed to depend on (parts of) libc + # and libzircon, and no other shared libraries. + assert_no_deps = [ + "//sdk/lib/fdio", + "//zircon/system/ulib/async-default", + ] + defines += [ "QEMU_PIPE_PATH=\"/loader-gpu-devices/class/goldfish-pipe/000\"", "GOLDFISH_ADDRESS_SPACE_DEVICE_NAME=\"/loader-gpu-devices/class/goldfish-address-space/000\"", diff --git a/system/OpenglSystemCommon/TraceProviderFuchsia.cpp b/system/OpenglSystemCommon/TraceProviderFuchsia.cpp index fc38c0b7..2e671627 100644 --- a/system/OpenglSystemCommon/TraceProviderFuchsia.cpp +++ b/system/OpenglSystemCommon/TraceProviderFuchsia.cpp @@ -18,9 +18,7 @@ #include <log/log.h> -#include <lib/async-loop/default.h> #include <lib/async/cpp/task.h> -#include <lib/fdio/directory.h> #include <lib/zx/channel.h> #include "services/service_connector.h" |