From c54d9f4c696e1e55567f32cb68a8efe4e4afd521 Mon Sep 17 00:00:00 2001
From: Sylvain <[EMAIL REDACTED]>
Date: Wed, 9 Jun 2021 09:59:37 +0200
Subject: [PATCH] Harfbuzz: keep config.h naming and include specific platform
config files
---
external/harfbuzz-2.8.0/Android.mk | 2 +-
external/harfbuzz-2.8.0/config.h | 7 +++++++
external/harfbuzz-2.8.0/src/hb-config.hh | 10 ++--------
3 files changed, 10 insertions(+), 9 deletions(-)
create mode 100644 external/harfbuzz-2.8.0/config.h
diff --git a/external/harfbuzz-2.8.0/Android.mk b/external/harfbuzz-2.8.0/Android.mk
index 342c6c8..65df63d 100644
--- a/external/harfbuzz-2.8.0/Android.mk
+++ b/external/harfbuzz-2.8.0/Android.mk
@@ -60,7 +60,7 @@ LOCAL_C_INCLUDES = \
#LOCAL_CFLAGS += -DHB_NO_MT -DHAVE_OT -DHAVE_UCDN -fPIC
-LOCAL_CFLAGS += -DHAVE_CONFIG_H -DHB_CONFIG_H_FILENAME=\"config_sdl_android.h\" -fPIC
+LOCAL_CFLAGS += -DHAVE_CONFIG_H -fPIC
LOCAL_EXPORT_C_INCLUDES = $(LOCAL_PATH)/src/
diff --git a/external/harfbuzz-2.8.0/config.h b/external/harfbuzz-2.8.0/config.h
new file mode 100644
index 0000000..46e3798
--- /dev/null
+++ b/external/harfbuzz-2.8.0/config.h
@@ -0,0 +1,7 @@
+
+
+#if defined(__ANDROID__)
+# include "config_sdl_android.h"
+#endif
+
+
diff --git a/external/harfbuzz-2.8.0/src/hb-config.hh b/external/harfbuzz-2.8.0/src/hb-config.hh
index 717927c..fc8d424 100644
--- a/external/harfbuzz-2.8.0/src/hb-config.hh
+++ b/external/harfbuzz-2.8.0/src/hb-config.hh
@@ -32,10 +32,7 @@
#endif
#ifdef HAVE_CONFIG_H
-#ifndef HB_CONFIG_H_FILENAME
-#define HB_CONFIG_H_FILENAME "config.h"
-#endif
-#include HB_CONFIG_H_FILENAME
+#include "config.h"
#endif
@@ -159,10 +156,7 @@
#endif
#ifdef HAVE_CONFIG_OVERRIDE_H
-#ifndef HB_CONFIG_OVERRIDE_H_FILENAME
-#define HB_CONFIG_OVERRIDE_H_FILENAME "config-override.h"
-#endif
-#include HB_CONFIG_OVERRIDE_H_FILENAME
+#include "config-override.h"
#endif