From be30e71dbd3c9eab59ce40105f406d2efdf741ab Mon Sep 17 00:00:00 2001
From: AIxWall <31502690+AIxWall@users.noreply.github.com>
Date: Mon, 31 Oct 2022 09:22:59 +0800
Subject: [PATCH 1/2] Revert "Fix build on OpenHarmony (ros2#395)"

This reverts commit 98d624a.
Signed-off-by: AIxWall <31502690+AIxWall@users.noreply.github.com>
---
 src/process.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/process.c b/src/process.c
index 9f21bbf7..2b438426 100644
--- a/src/process.c
+++ b/src/process.c
@@ -60,7 +60,7 @@ char * rcutils_get_executable_name(rcutils_allocator_t allocator)
 
 #if defined __APPLE__ || defined __FreeBSD__ || (defined __ANDROID__ && __ANDROID_API__ >= 21)
   const char * appname = getprogname();
-#elif defined __GNUC__ && !defined(__QNXNTO__) && !defined(__OHOS__)
+#elif defined __GNUC__ && !defined(__QNXNTO__)
   const char * appname = program_invocation_name;
 #elif defined _WIN32 || defined __CYGWIN__
   char appname[MAX_PATH];
@@ -68,7 +68,7 @@ char * rcutils_get_executable_name(rcutils_allocator_t allocator)
   if (size == 0) {
     return NULL;
   }
-#elif defined __QNXNTO__ || defined __OHOS__
+#elif defined __QNXNTO__
   extern char * __progname;
   const char * appname = __progname;
 #else

From e65f741d75621bece6aa79d7d9af7728c37c7a4b Mon Sep 17 00:00:00 2001
From: AIxWall <31502690+AIxWall@users.noreply.github.com>
Date: Mon, 31 Oct 2022 09:23:43 +0800
Subject: [PATCH 2/2] Revert "Fix build on OpenHarmony (ros2#395)"

This reverts commit 98d624a.
Signed-off-by: AIxWall <31502690+AIxWall@users.noreply.github.com>
---
 src/shared_library.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/shared_library.c b/src/shared_library.c
index f26d6b15..0190afcc 100644
--- a/src/shared_library.c
+++ b/src/shared_library.c
@@ -127,7 +127,7 @@ rcutils_load_shared_library(
     goto fail;
   }
   lib->library_path = rcutils_strdup(image_name, lib->allocator);
-#elif defined(_GNU_SOURCE) && !defined(__QNXNTO__) && !defined(__ANDROID__) && !defined(__OHOS__)
+#elif defined(_GNU_SOURCE) && !defined(__QNXNTO__) && !defined(__ANDROID__)
   struct link_map * map = NULL;
   if (dlinfo(lib->lib_pointer, RTLD_DI_LINKMAP, &map) != 0) {
     RCUTILS_SET_ERROR_MSG_WITH_FORMAT_STRING("dlinfo error: %s", dlerror());