Skip to content

Commit 3a09c06

Browse files
NorbertKlockiewiczNorbertKlockiewicz
committed
refactor: fix paths, remove duplicated binaries
1 parent b0e2da7 commit 3a09c06

File tree

15 files changed

+40
-615
lines changed

15 files changed

+40
-615
lines changed

‎apps/llm/ios/llm.xcodeproj/project.pbxproj‎

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

‎packages/react-native-executorch/android/src/main/cpp/CMakeLists.txt‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -89,12 +89,8 @@ endif()
8989
set(TOKENIZERS_LIBS
9090
"${LIBS_DIR}/tokenizers-cpp/${ANDROID_ABI}/libtokenizers_c.a"
9191
"${LIBS_DIR}/tokenizers-cpp/${ANDROID_ABI}/libtokenizers_cpp.a"
92+
"${LIBS_DIR}/tokenizers-cpp/${ANDROID_ABI}/libsentencepiece.a"
9293
)
93-
94-
set(TOKENIZERS_THIRD_PARTY_LIBS
95-
"${LIBS_DIR}/sentencepiece/${ANDROID_ABI}/libsentencepiece.a"
96-
)
97-
9894
# --------------
9995

10096
target_link_options(react-native-executorch PRIVATE -fopenmp -static-openmp)

‎packages/react-native-executorch/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"third-party/include",
1919
"third-party",
2020
"!third-party/ios/ExecutorchLib",
21-
"!ios/libs/executorch",
21+
"!third-party/ios/libs/executorch",
2222
"!ios/build",
2323
"!android/build",
2424
"!android/gradle",

‎packages/react-native-executorch/react-native-executorch.podspec‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,10 @@ Pod::Spec.new do |s|
1313
s.platforms = { :ios => min_ios_version_supported }
1414
s.source = { :git => "https://github.com/software-mansion/react-native-executorch.git", :tag => "#{s.version}" }
1515

16-
et_binaries_path = File.expand_path('$(PODS_TARGET_SRCROOT)/third-party/ios/libs/executorch', __dir__)
1716
tokenizers_binaries_path = File.expand_path('$(PODS_TARGET_SRCROOT)/third-party/ios/libs/tokenizers-cpp', __dir__)
1817

19-
pthreadpool_binaries_path = File.expand_path('$(PODS_TARGET_SRCROOT)/ios/libs/pthreadpool', __dir__)
20-
cpuinfo_binaries_path = File.expand_path('$(PODS_TARGET_SRCROOT)/ios/libs/cpuinfo', __dir__)
18+
pthreadpool_binaries_path = File.expand_path('$(PODS_TARGET_SRCROOT)/third-party/ios/libs/pthreadpool', __dir__)
19+
cpuinfo_binaries_path = File.expand_path('$(PODS_TARGET_SRCROOT)/third-party/ios/libs/cpuinfo', __dir__)
2120

2221
s.user_target_xcconfig = {
2322
"HEADER_SEARCH_PATHS" => "$(PODS_TARGET_SRCROOT)/third-party/include",

‎packages/react-native-executorch/third-party/android/libs/sentencepiece/arm64-v8a/libsentencepiece.a‎

-25 MB
Binary file not shown.

packages/react-native-executorch/third-party/android/libs/sentencepiece/x86_64/libsentencepiece.a renamed to packages/react-native-executorch/third-party/android/libs/tokenizers-cpp/x86_64/libsentencepiece.a

File renamed without changes.

‎packages/react-native-executorch/third-party/ios/ExecutorchLib.xcframework/Info.plist‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<key>BinaryPath</key>
99
<string>ExecutorchLib.framework/ExecutorchLib</string>
1010
<key>LibraryIdentifier</key>
11-
<string>ios-arm64-simulator</string>
11+
<string>ios-arm64</string>
1212
<key>LibraryPath</key>
1313
<string>ExecutorchLib.framework</string>
1414
<key>SupportedArchitectures</key>
@@ -17,14 +17,12 @@
1717
</array>
1818
<key>SupportedPlatform</key>
1919
<string>ios</string>
20-
<key>SupportedPlatformVariant</key>
21-
<string>simulator</string>
2220
</dict>
2321
<dict>
2422
<key>BinaryPath</key>
2523
<string>ExecutorchLib.framework/ExecutorchLib</string>
2624
<key>LibraryIdentifier</key>
27-
<string>ios-arm64</string>
25+
<string>ios-arm64-simulator</string>
2826
<key>LibraryPath</key>
2927
<string>ExecutorchLib.framework</string>
3028
<key>SupportedArchitectures</key>
@@ -33,6 +31,8 @@
3331
</array>
3432
<key>SupportedPlatform</key>
3533
<string>ios</string>
34+
<key>SupportedPlatformVariant</key>
35+
<string>simulator</string>
3636
</dict>
3737
</array>
3838
<key>CFBundlePackageType</key>

‎packages/react-native-executorch/third-party/ios/ExecutorchLib.xcframework/ios-arm64/ExecutorchLib.framework/ExecutorchLib‎

0 Bytes
Binary file not shown.

‎packages/react-native-executorch/third-party/ios/ExecutorchLib/ExecutorchLib.xcodeproj/project.pbxproj‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -329,40 +329,40 @@
329329
"OTHER_LDFLAGS[sdk=iphoneos*]" = (
330330
"$(inherited)",
331331
"-force_load",
332-
"$(PROJECT_DIR)/../../../ios/libs/executorch/libkernels_optimized_ios.a",
332+
"$(PROJECT_DIR)/../../../third-party/ios/libs/executorch/libkernels_optimized_ios.a",
333333
"-force_load",
334-
"$(PROJECT_DIR)/../../../ios/libs/executorch/libkernels_custom_ios.a",
334+
"$(PROJECT_DIR)/../../../third-party/ios/libs/executorch/libkernels_custom_ios.a",
335335
"-force_load",
336-
"$(PROJECT_DIR)/../../../ios/libs/executorch/libkernels_quantized_ios.a",
336+
"$(PROJECT_DIR)/../../../third-party/ios/libs/executorch/libkernels_quantized_ios.a",
337337
"-force_load",
338-
"$(PROJECT_DIR)/../../../ios/libs/executorch/libbackend_xnnpack_ios.a",
338+
"$(PROJECT_DIR)/../../../third-party/ios/libs/executorch/libbackend_xnnpack_ios.a",
339339
"-force_load",
340-
"$(PROJECT_DIR)/../../../ios/libs/executorch/libbackend_coreml_ios.a",
340+
"$(PROJECT_DIR)/../../../third-party/ios/libs/executorch/libbackend_coreml_ios.a",
341341
"-force_load",
342-
"$(PROJECT_DIR)/../../../ios/libs/executorch/libbackend_mps_ios.a",
342+
"$(PROJECT_DIR)/../../../third-party/ios/libs/executorch/libbackend_mps_ios.a",
343343
"-force_load",
344-
"$(PROJECT_DIR)/../../../ios/libs/executorch/libexecutorch_ios.a",
344+
"$(PROJECT_DIR)/../../../third-party/ios/libs/executorch/libexecutorch_ios.a",
345345
"-force_load",
346-
"$(PROJECT_DIR)/../../../ios/libs/executorch/libthreadpool_ios.a",
346+
"$(PROJECT_DIR)/../../../third-party/ios/libs/executorch/libthreadpool_ios.a",
347347
);
348348
"OTHER_LDFLAGS[sdk=iphonesimulator*]" = (
349349
"$(inherited)",
350350
"-force_load",
351-
"$(PROJECT_DIR)/../../../ios/libs/executorch/libkernels_optimized_simulator.a",
351+
"$(PROJECT_DIR)/../../../third-party/ios/libs/executorch/libkernels_optimized_simulator.a",
352352
"-force_load",
353-
"$(PROJECT_DIR)/../../../ios/libs/executorch/libkernels_custom_simulator.a",
353+
"$(PROJECT_DIR)/../../../third-party/ios/libs/executorch/libkernels_custom_simulator.a",
354354
"-force_load",
355-
"$(PROJECT_DIR)/../../../ios/libs/executorch/libkernels_quantized_simulator.a",
355+
"$(PROJECT_DIR)/../../../third-party/ios/libs/executorch/libkernels_quantized_simulator.a",
356356
"-force_load",
357-
"$(PROJECT_DIR)/../../../ios/libs/executorch/libbackend_xnnpack_simulator.a",
357+
"$(PROJECT_DIR)/../../../third-party/ios/libs/executorch/libbackend_xnnpack_simulator.a",
358358
"-force_load",
359-
"$(PROJECT_DIR)/../../../ios/libs/executorch/libbackend_coreml_simulator.a",
359+
"$(PROJECT_DIR)/../../../third-party/ios/libs/executorch/libbackend_coreml_simulator.a",
360360
"-force_load",
361-
"$(PROJECT_DIR)/../../../ios/libs/executorch/libbackend_mps_simulator.a",
361+
"$(PROJECT_DIR)/../../../third-party/ios/libs/executorch/libbackend_mps_simulator.a",
362362
"-force_load",
363-
"$(PROJECT_DIR)/../../../ios/libs/executorch/libexecutorch_simulator.a",
363+
"$(PROJECT_DIR)/../../../third-party/ios/libs/executorch/libexecutorch_simulator.a",
364364
"-force_load",
365-
"$(PROJECT_DIR)/../../../ios/libs/executorch/libthreadpool_simulator.a",
365+
"$(PROJECT_DIR)/../../../third-party/ios/libs/executorch/libthreadpool_simulator.a",
366366
);
367367
PRODUCT_BUNDLE_IDENTIFIER = com.swmansion.Executorch;
368368
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
@@ -413,40 +413,40 @@
413413
"OTHER_LDFLAGS[sdk=iphoneos*]" = (
414414
"$(inherited)",
415415
"-force_load",
416-
"$(PROJECT_DIR)/../../../ios/libs/executorch/libkernels_optimized_ios.a",
416+
"$(PROJECT_DIR)/../../../third-party/ios/libs/executorch/libkernels_optimized_ios.a",
417417
"-force_load",
418-
"$(PROJECT_DIR)/../../../ios/libs/executorch/libkernels_custom_ios.a",
418+
"$(PROJECT_DIR)/../../../third-party/ios/libs/executorch/libkernels_custom_ios.a",
419419
"-force_load",
420-
"$(PROJECT_DIR)/../../../ios/libs/executorch/libkernels_quantized_ios.a",
420+
"$(PROJECT_DIR)/../../../third-party/ios/libs/executorch/libkernels_quantized_ios.a",
421421
"-force_load",
422-
"$(PROJECT_DIR)/../../../ios/libs/executorch/libbackend_xnnpack_ios.a",
422+
"$(PROJECT_DIR)/../../../third-party/ios/libs/executorch/libbackend_xnnpack_ios.a",
423423
"-force_load",
424-
"$(PROJECT_DIR)/../../../ios/libs/executorch/libbackend_coreml_ios.a",
424+
"$(PROJECT_DIR)/../../../third-party/ios/libs/executorch/libbackend_coreml_ios.a",
425425
"-force_load",
426-
"$(PROJECT_DIR)/../../../ios/libs/executorch/libbackend_mps_ios.a",
426+
"$(PROJECT_DIR)/../../../third-party/ios/libs/executorch/libbackend_mps_ios.a",
427427
"-force_load",
428-
"$(PROJECT_DIR)/../../../ios/libs/executorch/libexecutorch_ios.a",
428+
"$(PROJECT_DIR)/../../../third-party/ios/libs/executorch/libexecutorch_ios.a",
429429
"-force_load",
430-
"$(PROJECT_DIR)/../../../ios/libs/executorch/libthreadpool_ios.a",
430+
"$(PROJECT_DIR)/../../../third-party/ios/libs/executorch/libthreadpool_ios.a",
431431
);
432432
"OTHER_LDFLAGS[sdk=iphonesimulator*]" = (
433433
"$(inherited)",
434434
"-force_load",
435-
"$(PROJECT_DIR)/../../../ios/libs/executorch/libkernels_optimized_simulator.a",
435+
"$(PROJECT_DIR)/../../../third-party/ios/libs/executorch/libkernels_optimized_simulator.a",
436436
"-force_load",
437-
"$(PROJECT_DIR)/../../../ios/libs/executorch/libkernels_custom_simulator.a",
437+
"$(PROJECT_DIR)/../../../third-party/ios/libs/executorch/libkernels_custom_simulator.a",
438438
"-force_load",
439-
"$(PROJECT_DIR)/../../../ios/libs/executorch/libkernels_quantized_simulator.a",
439+
"$(PROJECT_DIR)/../../../third-party/ios/libs/executorch/libkernels_quantized_simulator.a",
440440
"-force_load",
441-
"$(PROJECT_DIR)/../../../ios/libs/executorch/libbackend_xnnpack_simulator.a",
441+
"$(PROJECT_DIR)/../../../third-party/ios/libs/executorch/libbackend_xnnpack_simulator.a",
442442
"-force_load",
443-
"$(PROJECT_DIR)/../../../ios/libs/executorch/libbackend_coreml_simulator.a",
443+
"$(PROJECT_DIR)/../../../third-party/ios/libs/executorch/libbackend_coreml_simulator.a",
444444
"-force_load",
445-
"$(PROJECT_DIR)/../../../ios/libs/executorch/libbackend_mps_simulator.a",
445+
"$(PROJECT_DIR)/../../../third-party/ios/libs/executorch/libbackend_mps_simulator.a",
446446
"-force_load",
447-
"$(PROJECT_DIR)/../../../ios/libs/executorch/libexecutorch_simulator.a",
447+
"$(PROJECT_DIR)/../../../third-party/ios/libs/executorch/libexecutorch_simulator.a",
448448
"-force_load",
449-
"$(PROJECT_DIR)/../../../ios/libs/executorch/libthreadpool_simulator.a",
449+
"$(PROJECT_DIR)/../../../third-party/ios/libs/executorch/libthreadpool_simulator.a",
450450
);
451451
PRODUCT_BUNDLE_IDENTIFIER = com.swmansion.Executorch;
452452
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";

packages/react-native-executorch/ios/libs/cpuinfo/libcpuinfo.a renamed to packages/react-native-executorch/third-party/ios/libs/cpuinfo/libcpuinfo.a

File renamed without changes.

0 commit comments

Comments
 (0)