Skip to content

Commit 15e5418

Browse files
DjDeveloperrDjDeveloperr
authored
chore: import napi-android history
Merge Android runtime history into refactor without squashing.
2 parents f3d0b3f + 032f0d1 commit 15e5418

3,297 files changed

Lines changed: 655832 additions & 21410 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitattributes‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
platforms/android/test-app/runtime/src/main/libs/**/libv8_monolith.a filter=lfs diff=lfs merge=lfs -text

‎.gitignore‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,10 @@ v8_build
5454
.cipd/
5555

5656
# project template
57-
/templates/ios/.build_env_vars.sh
58-
/templates/ios/__PROJECT_NAME__.xcodeproj/project.xcworkspace/xcshareddata/
59-
/templates/visionos/.build_env_vars.sh
60-
/templates/visionos/__PROJECT_NAME__.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
57+
/platforms/apple/templates/ios/.build_env_vars.sh
58+
/platforms/apple/templates/ios/__PROJECT_NAME__.xcodeproj/project.xcworkspace/xcshareddata/
59+
/platforms/apple/templates/visionos/.build_env_vars.sh
60+
/platforms/apple/templates/visionos/__PROJECT_NAME__.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
6161

6262
.cache/
6363

@@ -67,10 +67,10 @@ packages/*/types
6767
SwiftBindgen
6868

6969
# Generated Objective-C/C dispatch wrappers
70-
NativeScript/ffi/*/GeneratedSignatureDispatch.inc
71-
NativeScript/ffi/*/GeneratedSignatureDispatch.inc.stamp
72-
NativeScript/ffi/*/GeneratedGsdSignatureDispatch.inc
73-
NativeScript/ffi/*/GeneratedGsdSignatureDispatch.inc.stamp
70+
NativeScript/ffi/**/GeneratedSignatureDispatch.inc
71+
NativeScript/ffi/**/GeneratedSignatureDispatch.inc.stamp
72+
NativeScript/ffi/**/GeneratedGsdSignatureDispatch.inc
73+
NativeScript/ffi/**/GeneratedGsdSignatureDispatch.inc.stamp
7474

7575
# Packaged native framework artifacts
7676
packages/*/NativeScript.xcframework/

‎NativeScript/CMakeLists.txt‎

Lines changed: 58 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -228,68 +228,68 @@ include_directories(
228228
)
229229

230230
set(FFI_SHARED_SOURCE_FILES
231-
ffi/shared/Tasks.cpp
231+
ffi/objc/shared/Tasks.cpp
232232
)
233233

234234
set(FFI_NAPI_SOURCE_FILES
235-
ffi/napi/AutoreleasePool.mm
236-
ffi/napi/Protocol.mm
237-
ffi/napi/ObjCBridge.mm
238-
ffi/napi/Block.mm
239-
ffi/napi/Class.mm
240-
ffi/napi/Closure.mm
241-
ffi/napi/ClassMember.mm
242-
ffi/napi/Cif.mm
243-
ffi/napi/TypeConv.mm
244-
ffi/napi/Util.mm
245-
ffi/napi/Struct.mm
246-
ffi/napi/ObjectRef.mm
247-
ffi/napi/JSObject.mm
248-
ffi/napi/Enum.mm
249-
ffi/napi/Variable.mm
250-
ffi/napi/Object.mm
251-
ffi/napi/CFunction.mm
252-
ffi/napi/Interop.mm
253-
ffi/napi/InlineFunctions.mm
254-
ffi/napi/ClassBuilder.mm
235+
ffi/objc/napi/AutoreleasePool.mm
236+
ffi/objc/napi/Protocol.mm
237+
ffi/objc/napi/ObjCBridge.mm
238+
ffi/objc/napi/Block.mm
239+
ffi/objc/napi/Class.mm
240+
ffi/objc/napi/Closure.mm
241+
ffi/objc/napi/ClassMember.mm
242+
ffi/objc/napi/Cif.mm
243+
ffi/objc/napi/TypeConv.mm
244+
ffi/objc/napi/Util.mm
245+
ffi/objc/napi/Struct.mm
246+
ffi/objc/napi/ObjectRef.mm
247+
ffi/objc/napi/JSObject.mm
248+
ffi/objc/napi/Enum.mm
249+
ffi/objc/napi/Variable.mm
250+
ffi/objc/napi/Object.mm
251+
ffi/objc/napi/CFunction.mm
252+
ffi/objc/napi/Interop.mm
253+
ffi/objc/napi/InlineFunctions.mm
254+
ffi/objc/napi/ClassBuilder.mm
255255
)
256256

257257
set(FFI_ENGINE_SHARED_SOURCE_FILES
258-
ffi/shared/MetadataState.mm
258+
ffi/objc/shared/MetadataState.mm
259259
)
260260

261261
set(FFI_HERMES_ENGINE_SOURCE_FILES
262262
${FFI_ENGINE_SHARED_SOURCE_FILES}
263-
ffi/hermes/NativeApiJsi.mm
263+
ffi/objc/hermes/NativeApiJsi.mm
264264
)
265265

266266
set(FFI_V8_ENGINE_SOURCE_FILES
267267
${FFI_ENGINE_SHARED_SOURCE_FILES}
268-
ffi/v8/NativeApiV8.mm
269-
ffi/v8/NativeApiV8HostObjects.mm
270-
ffi/v8/NativeApiV8Runtime.mm
271-
ffi/v8/NativeApiV8Value.mm
268+
ffi/objc/v8/NativeApiV8.mm
269+
ffi/objc/v8/NativeApiV8HostObjects.mm
270+
ffi/objc/v8/NativeApiV8Runtime.mm
271+
ffi/objc/v8/NativeApiV8Value.mm
272272
)
273273

274274
set(FFI_JSC_ENGINE_SOURCE_FILES
275275
${FFI_ENGINE_SHARED_SOURCE_FILES}
276-
ffi/jsc/NativeApiJSC.mm
277-
ffi/jsc/NativeApiJSCHostObjects.mm
278-
ffi/jsc/NativeApiJSCRuntime.mm
279-
ffi/jsc/NativeApiJSCValue.mm
276+
ffi/objc/jsc/NativeApiJSC.mm
277+
ffi/objc/jsc/NativeApiJSCHostObjects.mm
278+
ffi/objc/jsc/NativeApiJSCRuntime.mm
279+
ffi/objc/jsc/NativeApiJSCValue.mm
280280
)
281281

282282
set(FFI_QUICKJS_ENGINE_SOURCE_FILES
283283
${FFI_ENGINE_SHARED_SOURCE_FILES}
284-
ffi/quickjs/NativeApiQuickJSHostObjects.mm
285-
ffi/quickjs/NativeApiQuickJS.mm
286-
ffi/quickjs/NativeApiQuickJSRuntime.mm
287-
ffi/quickjs/NativeApiQuickJSValue.mm
284+
ffi/objc/quickjs/NativeApiQuickJSHostObjects.mm
285+
ffi/objc/quickjs/NativeApiQuickJS.mm
286+
ffi/objc/quickjs/NativeApiQuickJSRuntime.mm
287+
ffi/objc/quickjs/NativeApiQuickJSValue.mm
288288
)
289289

290290
set(SOURCE_FILES
291291
${FFI_SHARED_SOURCE_FILES}
292-
runtime/NativeScriptException.mm
292+
runtime/apple/NativeScriptException.mm
293293
)
294294

295295
if(NS_EFFECTIVE_FFI_BACKEND STREQUAL "napi")
@@ -302,28 +302,28 @@ endif()
302302
if(ENABLE_JS_RUNTIME)
303303
set(SOURCE_FILES
304304
${SOURCE_FILES}
305-
runtime/modules/console/Console.cpp
306-
runtime/Runtime.cpp
307-
runtime/modules/worker/Worker.mm
308-
runtime/modules/worker/MessageJSON.cpp
309-
runtime/modules/worker/MessageV8.cpp
310-
runtime/modules/worker/ConcurrentQueue.cpp
311-
runtime/modules/worker/WorkerImpl.mm
312-
runtime/modules/worker/WorkerImpl.mm
313-
runtime/modules/module/ModuleInternal.cpp
314-
runtime/modules/node/Node.cpp
315-
runtime/modules/node/FS.cpp
316-
runtime/modules/node/Path.cpp
317-
runtime/modules/node/Process.cpp
318-
runtime/modules/node/VM.cpp
319-
runtime/modules/performance/Performance.cpp
320-
runtime/ThreadSafeFunction.mm
321-
runtime/Bundle.mm
322-
runtime/modules/timers/Timers.mm
323-
runtime/modules/app/App.mm
324-
runtime/modules/web/Web.mm
325-
runtime/NativeScript.mm
326-
runtime/RuntimeConfig.cpp
305+
runtime/apple/modules/console/Console.cpp
306+
runtime/apple/Runtime.cpp
307+
runtime/apple/modules/worker/Worker.mm
308+
runtime/apple/modules/worker/MessageJSON.cpp
309+
runtime/apple/modules/worker/MessageV8.cpp
310+
runtime/apple/modules/worker/ConcurrentQueue.cpp
311+
runtime/apple/modules/worker/WorkerImpl.mm
312+
runtime/apple/modules/worker/WorkerImpl.mm
313+
runtime/apple/modules/module/ModuleInternal.cpp
314+
runtime/apple/modules/node/Node.cpp
315+
runtime/apple/modules/node/FS.cpp
316+
runtime/apple/modules/node/Path.cpp
317+
runtime/apple/modules/node/Process.cpp
318+
runtime/apple/modules/node/VM.cpp
319+
runtime/apple/modules/performance/Performance.cpp
320+
runtime/apple/ThreadSafeFunction.mm
321+
runtime/apple/Bundle.mm
322+
runtime/apple/modules/timers/Timers.mm
323+
runtime/apple/modules/app/App.mm
324+
runtime/apple/modules/web/Web.mm
325+
runtime/apple/NativeScript.mm
326+
runtime/apple/RuntimeConfig.cpp
327327
runtime/modules/url/ada/ada.cpp
328328
runtime/modules/url/URL.cpp
329329
runtime/modules/url/URLSearchParams.cpp

‎NativeScript/cli/main.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
#include <iostream>
66
#include <string>
77

8-
#include "runtime/NativeScriptException.h"
9-
#include "runtime/Bundle.h"
10-
#include "runtime/Runtime.h"
11-
#include "runtime/RuntimeConfig.h"
8+
#include "runtime/apple/NativeScriptException.h"
9+
#include "runtime/apple/Bundle.h"
10+
#include "runtime/apple/Runtime.h"
11+
#include "runtime/apple/RuntimeConfig.h"
1212
#include "segappend.h"
13-
#include "ffi/shared/Tasks.h"
13+
#include "ffi/objc/shared/Tasks.h"
1414
#include "BundleLoader.h"
1515

1616
using namespace nativescript;

‎NativeScript/ffi/hermes/NativeApiJsiSignatureDispatch.h‎

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)