diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-02-27 19:01:36 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-02-27 19:01:36 +0000 |
| commit | a9102472bb741e93b23553d65959e05b46cef8e6 (patch) | |
| tree | 27c6f66126132e95bedc513322d49dc2b70ae57c | |
| parent | 1166436d9fb6ad20f93de946628cab05582e5908 (diff) | |
| parent | 63644c0cc14a5edadbf20a6494a03cde6b520598 (diff) | |
| download | qemu-emu-33-release.tar.gz | |
Merge "Merge cherrypicks of ['android-review.googlesource.com/2979991'] into emu-33-release." into emu-33-releaseemu-33-release
| -rw-r--r-- | android/android-emu-base/android/base/network/IpAddress.cpp | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/android/android-emu-base/android/base/network/IpAddress.cpp b/android/android-emu-base/android/base/network/IpAddress.cpp index ad97bcb241..3dbd605df4 100644 --- a/android/android-emu-base/android/base/network/IpAddress.cpp +++ b/android/android-emu-base/android/base/network/IpAddress.cpp @@ -103,14 +103,6 @@ IpAddress::IpAddress(const char* str) { std::string IpAddress::toString() const { std::string result; -// TODO: Figure out why on mingw build of gfxstream backend, we get a link -// error for inet_ntop here. Since inet_ntop is not needed in gfxstream -// backend, we can safely avoid referencing it in the linker. In the long -// term, perhaps we should unbundle more dependencies away from -// android-emu-base so that it doesn't need this function in the first place. -#if defined(AEMU_GFXSTREAM_BACKEND) && AEMU_GFXSTREAM_BACKEND - return result; -#else switch (mKind) { case Kind::Ipv4: { struct in_addr ip4; @@ -136,7 +128,6 @@ std::string IpAddress::toString() const { result = "<invalid>"; } return result; -#endif } size_t IpAddress::hash() const { |