commit | ae4fde42a296af61dfc169aa8769e7b45058f6cb | [log] [tgz] |
---|---|---|
author | Jason Macnak <natsu@google.com> | Tue Apr 04 21:32:00 2023 +0000 |
committer | swiftshader-scoped@luci-project-accounts.iam.gserviceaccount.com <swiftshader-scoped@luci-project-accounts.iam.gserviceaccount.com> | Fri Apr 07 16:14:38 2023 +0000 |
tree | 72e2e66e51590048b6cba3f04e1be292fa8efa36 | |
parent | 08f12cdc2290dfe803f1b1d936c04e08d1b8bdf9 [diff] |
Remove HAVE_MALLINFO2 from Android LLVM16 config ... to fix build error on seen in SwiftShader->AOSP roller in aosp/2522816. Bug: b/272710814 Test: untested, speculative change based on inspection Change-Id: If3db2b544d468990e2967db10c8c020bc90d8e22 Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/71308 Kokoro-Result: kokoro <noreply+kokoro@google.com> Reviewed-by: Jean-François Geyelin <jif@google.com> Commit-Queue: Jason Macnak <natsu@google.com> Presubmit-Ready: Jason Macnak <natsu@google.com> Tested-by: Jason Macnak <natsu@google.com>
diff --git a/third_party/llvm-16.0/configs/android/include/llvm/Config/config.h b/third_party/llvm-16.0/configs/android/include/llvm/Config/config.h index f0cd1df..7467728 100644 --- a/third_party/llvm-16.0/configs/android/include/llvm/Config/config.h +++ b/third_party/llvm-16.0/configs/android/include/llvm/Config/config.h
@@ -138,7 +138,7 @@ #define HAVE_MALLINFO 1 /* Define to 1 if you have the `mallinfo2' function. */ -#define HAVE_MALLINFO2 1 +/* #undef HAVE_MALLINFO2 */ /* Define to 1 if you have the <malloc/malloc.h> header file. */ /* #undef HAVE_MALLOC_MALLOC_H */