From 10a0f10f6d0638d60b9e62d2609ae9c91535ed40 Mon Sep 17 00:00:00 2001
From: groshevmaksim <groshev.maksim@h-partners.com>
Date: Tue, 13 May 2025 20:05:48 +0300
Subject: [PATCH] remove flag

Signed-off-by: groshevmaksim <groshev.maksim@h-partners.com>
Change-Id: Ie93244d325a61c49d0174bc625f635830f555e27
---
 interfaces/inner_api/napi/native_node_api.h     | 2 --
 native_engine/impl/ark/ark_native_reference.cpp | 2 --
 native_engine/impl/ark/ark_native_reference.h   | 2 --
 native_engine/native_api.cpp                    | 4 +---
 test/unittest/test_napi.cpp                     | 4 ----
 5 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/interfaces/inner_api/napi/native_node_api.h b/interfaces/inner_api/napi/native_node_api.h
index 713571120..68733b968 100644
--- a/interfaces/inner_api/napi/native_node_api.h
+++ b/interfaces/inner_api/napi/native_node_api.h
@@ -192,7 +192,6 @@ typedef enum {
     NAPI_DIRECTION_HYBRID = 3, // STS object and the JS object references each other
 } NapiXRefDirection;
 
-#ifdef PANDA_JS_ETS_HYBRID_MODE
 // XGC specific internal API
 NAPI_EXTERN napi_status napi_vm_handshake(napi_env env, void* inputIface, void** outputIface);
 NAPI_EXTERN napi_status napi_xref_wrap(napi_env env,
@@ -217,7 +216,6 @@ NAPI_EXTERN napi_status napi_is_alive_object(napi_env env, napi_ref ref, bool* r
 NAPI_EXTERN napi_status napi_is_contain_object(napi_env env, napi_ref ref, bool* result);
 NAPI_EXTERN napi_status napi_is_xref_type(napi_env env, napi_value js_object, bool* result);
 NAPI_EXTERN napi_status napi_get_ets_implements(napi_env env, napi_value value, napi_value* result);
-#endif  // PANDA_JS_ETS_HYBRID_MODE
 NAPI_EXTERN napi_status napi_register_appstate_callback(napi_env env, NapiAppStateCallback callback);
 
 #endif /* FOUNDATION_ACE_NAPI_INTERFACES_KITS_NAPI_NATIVE_NODE_API_H */
diff --git a/native_engine/impl/ark/ark_native_reference.cpp b/native_engine/impl/ark/ark_native_reference.cpp
index f086ba26a..e47c5eedb 100644
--- a/native_engine/impl/ark/ark_native_reference.cpp
+++ b/native_engine/impl/ark/ark_native_reference.cpp
@@ -224,7 +224,6 @@ void ArkNativeReference::ResetFinalizer()
     hint_ = nullptr;
 }
 
-#ifdef PANDA_JS_ETS_HYBRID_MODE
 void ArkNativeReference::MarkFromObject()
 {
     value_.MarkFromObject();
@@ -240,4 +239,3 @@ bool ArkNativeReference::IsValidHeapObject()
     return value_.IsValidHeapObject();
 }
 
-#endif // PANDA_JS_ETS_HYBRID_MODE
diff --git a/native_engine/impl/ark/ark_native_reference.h b/native_engine/impl/ark/ark_native_reference.h
index 10b0c7367..d44ab41ef 100644
--- a/native_engine/impl/ark/ark_native_reference.h
+++ b/native_engine/impl/ark/ark_native_reference.h
@@ -90,11 +90,9 @@ public:
     bool GetFinalRun() override;
     napi_value GetNapiValue() override;
     void ResetFinalizer()  override;
-#ifdef PANDA_JS_ETS_HYBRID_MODE
     void MarkFromObject();
     bool IsObjectAlive();
     bool IsValidHeapObject();
-#endif // PANDA_JS_ETS_HYBRID_MODE
 
 private:
     inline void ArkNativeReferenceConstructor(uint32_t initialRefCount, bool deleteSelf)
diff --git a/native_engine/native_api.cpp b/native_engine/native_api.cpp
index 0228afa07..8aa190b59 100644
--- a/native_engine/native_api.cpp
+++ b/native_engine/native_api.cpp
@@ -4412,7 +4412,6 @@ NAPI_EXTERN napi_status napi_register_appstate_callback(napi_env env, NapiAppSta
     return napi_clear_last_error(env);
 }
 
-#ifdef PANDA_JS_ETS_HYBRID_MODE
 NAPI_EXTERN napi_status napi_vm_handshake(napi_env env,
                                           [[maybe_unused]] void* inputIface,
                                           [[maybe_unused]] void** outputIface)
@@ -4516,5 +4515,4 @@ NAPI_EXTERN napi_status napi_is_xref_type(napi_env env, napi_value js_object, bo
         *result = true;
     }
     return GET_RETURN_STATUS(env);
-}
-#endif // PANDA_JS_ETS_HYBRID_MODE
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/test/unittest/test_napi.cpp b/test/unittest/test_napi.cpp
index 78285de1b..c32eaa011 100644
--- a/test/unittest/test_napi.cpp
+++ b/test/unittest/test_napi.cpp
@@ -7625,7 +7625,6 @@ HWTEST_F(NapiBasicTest, NapiWrapTest006, testing::ext::TestSize.Level1)
     ASSERT_EQ(status, napi_object_expected);
 }
 
-#ifdef PANDA_JS_ETS_HYBRID_MODE
 HWTEST_F(NapiBasicTest, NapiWrapWithXRefTest001, testing::ext::TestSize.Level1)
 {
     napi_env env = reinterpret_cast<napi_env>(engine_);
@@ -7743,7 +7742,6 @@ HWTEST_F(NapiBasicTest, NapiCreateXRefTest003, testing::ext::TestSize.Level1)
     auto res = napi_create_xref(env, nullptr, 1, nullptr);
     ASSERT_EQ(res, napi_invalid_arg);
 }
-#endif
 
 HWTEST_F(NapiBasicTest, NapiRegisterAppStateCallbakcTest001, testing::ext::TestSize.Level1)
 {
@@ -7827,7 +7825,6 @@ HWTEST_F(NapiBasicTest, NapiUnwrapTest006, testing::ext::TestSize.Level1)
     ASSERT_EQ(status, napi_invalid_arg);
 }
 
-#ifdef PANDA_JS_ETS_HYBRID_MODE
 HWTEST_F(NapiBasicTest, NapiXrefUnwrapTest001, testing::ext::TestSize.Level1)
 {
     napi_env env = reinterpret_cast<napi_env>(engine_);
@@ -7838,7 +7835,6 @@ HWTEST_F(NapiBasicTest, NapiXrefUnwrapTest001, testing::ext::TestSize.Level1)
     napi_status status = napi_xref_unwrap(env, obj, (void**)&testStr);
     ASSERT_EQ(status, napi_ok);
 }
-#endif
 
 HWTEST_F(NapiBasicTest, NapiRemoveWrapTest001, testing::ext::TestSize.Level1)
 {
-- 
Gitee