Skip to content

Commit 25ce228

Browse files
committed
fix: Fix Android build
1 parent 0c3e69d commit 25ce228

File tree

6 files changed

+51
-8
lines changed

6 files changed

+51
-8
lines changed

package/android/CMakeLists.txt

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,20 @@ add_library(
1616
../cpp/wrappers/WKTJsiWrapper.cpp
1717
../cpp/WKTJsiWorkletApi.cpp
1818
../cpp/WKTJsiWorkletContext.cpp
19-
)
19+
../cpp/NativeWorkletsModule.cpp
20+
)
2021

2122
# Add headers search paths
22-
target_include_directories(${PACKAGE_NAME} PUBLIC ../cpp)
23+
target_include_directories(
24+
${PACKAGE_NAME}
25+
PUBLIC
26+
../cpp
27+
../cpp/base
28+
../cpp/decorators
29+
../cpp/dispatch
30+
../cpp/sharedvalues
31+
../cpp/wrappers
32+
)
2333

2434
# Add Hermes (from com.facebook.react:hermes-android)
2535
find_package(hermes-engine REQUIRED CONFIG)

package/android/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ def getExtOrIntegerDefault(name) {
2121
}
2222

2323
android {
24-
namespace "com.worklets"
24+
namespace "com.margelo.worklets"
2525

2626
ndkVersion getExtOrDefault("ndkVersion")
2727
compileSdkVersion getExtOrIntegerDefault("compileSdkVersion")
@@ -90,5 +90,5 @@ dependencies {
9090
react {
9191
jsRootDir = file("../src/")
9292
libraryName = "Worklets"
93-
codegenJavaPackageName = "com.worklets"
93+
codegenJavaPackageName = "com.margelo.worklets"
9494
}
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
package com.margelo.worklets;
2+
3+
import androidx.annotation.NonNull;
4+
import androidx.annotation.Nullable;
5+
6+
import com.facebook.react.bridge.NativeModule;
7+
import com.facebook.react.bridge.ReactApplicationContext;
8+
import com.facebook.react.module.model.ReactModuleInfo;
9+
import com.facebook.react.module.model.ReactModuleInfoProvider;
10+
import com.facebook.react.TurboReactPackage;
11+
12+
import java.util.HashMap;
13+
import java.util.Map;
14+
15+
// A dummy Java package just so that RN CLI finds react-native-worklets-core and autolinks it.
16+
// The actual module is a C++ CxxTurboModule.
17+
public class WorkletsPackage extends TurboReactPackage {
18+
@Nullable
19+
@Override
20+
public NativeModule getModule(@NonNull String name, @NonNull ReactApplicationContext reactContext) {
21+
// dummy
22+
return null;
23+
}
24+
25+
@Override
26+
public ReactModuleInfoProvider getReactModuleInfoProvider() {
27+
return () -> {
28+
// dummy
29+
final Map<String, ReactModuleInfo> moduleInfos = new HashMap<>();
30+
return moduleInfos;
31+
};
32+
}
33+
}

package/example/android/app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,9 @@ android {
7474
buildToolsVersion rootProject.ext.buildToolsVersion
7575
compileSdk rootProject.ext.compileSdkVersion
7676

77-
namespace "com.workletsexample"
77+
namespace "com.margelo.workletsexample"
7878
defaultConfig {
79-
applicationId "com.workletsexample"
79+
applicationId "com.margelo.workletsexample"
8080
minSdkVersion rootProject.ext.minSdkVersion
8181
targetSdkVersion rootProject.ext.targetSdkVersion
8282
versionCode 1

package/example/android/app/src/main/java/com/workletsexample/MainActivity.kt renamed to package/example/android/app/src/main/java/com/margelo/workletsexample/MainActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.workletsexample
1+
package com.margelo.workletsexample
22

33
import com.facebook.react.ReactActivity
44
import com.facebook.react.ReactActivityDelegate

package/example/android/app/src/main/java/com/workletsexample/MainApplication.kt renamed to package/example/android/app/src/main/java/com/margelo/workletsexample/MainApplication.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.workletsexample
1+
package com.margelo.workletsexample
22

33
import android.app.Application
44
import com.facebook.react.PackageList

0 commit comments

Comments
 (0)