diff --git a/interfaces/inner_api/napi/native_node_api.h b/interfaces/inner_api/napi/native_node_api.h index 7135711209808aac757fcd659e63275bf24aa562..68733b9680cb8bf8738c52d02ce304439b36d49d 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 f086ba26a04215940a5c5f534bbbc4cd2ea1933b..e47c5eedb14e2186dd848ee4d4b54e8505eb4b33 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 10b0c7367bb46877452961df6209e20ba382f733..d44ab41ef2b555aca96490340800ff30f623bc3e 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 0228afa0714ae40a94c2271a6bd6476a497931e4..8aa190b59090f233e29209b123e21d3fde49e362 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 78285de1b056cc430f8661a91b8400b3f9ab3009..c32eaa011c76e12913f21b3ed01854ecd9856362 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(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(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) {