diff options
| author | Weilun Du <wdu@google.com> | 2024-02-27 11:02:25 -0500 |
|---|---|---|
| committer | Bo Hu <bohu@google.com> | 2024-03-13 18:40:16 +0000 |
| commit | 640fa5054eb0ec0bba5da621eef453f79065af43 (patch) | |
| tree | f29ea6ab7cc3a1d8b9aa6b5b51019b6c0a60915e | |
| parent | 80449f04399a41c139e24b69659ed0a96be68489 (diff) | |
| download | qemu-640fa5054eb0ec0bba5da621eef453f79065af43.tar.gz | |
[Bug Fix] Remove GfxStream Macros for IPAddress toString function.
To fix the -http-proxy IP address parsing issue, we removed the gfxstream macros which was added due to unknown reason in mingw build.
BUG: 314614435
Signed-off-by: Weilun Du <wdu@google.com>
(cherry picked from https://android-review.googlesource.com/q/commit:79cb7130c4a02f58e7126cc56b77cc76c42b0c25)
Merged-In: I7bd2be0a785b62845b2c1ef3e06c2adb708fabe6
Change-Id: I7bd2be0a785b62845b2c1ef3e06c2adb708fabe6
(cherry picked from commit c7df72b4f1a402baa32858946baea4cb726b7ff8)
| -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 { |