1--- android/CMakeLists.txt
2+++ android/CMakeLists.txt
3@@ -47,21 +47,21 @@ add_library(
4         "${PROJECT_SOURCE_DIR}/cpp/rnskia-android/RNSkOpenGLCanvasProvider.cpp"
5         "${PROJECT_SOURCE_DIR}/cpp/rnskia-android/SkiaOpenGLRenderer.cpp"
6
7-        "${PROJECT_SOURCE_DIR}/cpp/jsi/JsiHostObject.cpp"
8-        "${PROJECT_SOURCE_DIR}/cpp/jsi/JsiValue.cpp"
9-        "${PROJECT_SOURCE_DIR}/cpp/jsi/RuntimeLifecycleMonitor.cpp"
10-        "${PROJECT_SOURCE_DIR}/cpp/jsi/RuntimeAwareCache.cpp"
11-        "${PROJECT_SOURCE_DIR}/cpp/jsi/JsiPromises.cpp"
12+        "${PROJECT_SOURCE_DIR}/../cpp/jsi/JsiHostObject.cpp"
13+        "${PROJECT_SOURCE_DIR}/../cpp/jsi/JsiValue.cpp"
14+        "${PROJECT_SOURCE_DIR}/../cpp/jsi/RuntimeLifecycleMonitor.cpp"
15+        "${PROJECT_SOURCE_DIR}/../cpp/jsi/RuntimeAwareCache.cpp"
16+        "${PROJECT_SOURCE_DIR}/../cpp/jsi/JsiPromises.cpp"
17
18-        "${PROJECT_SOURCE_DIR}/cpp/rnskia/RNSkManager.cpp"
19-        "${PROJECT_SOURCE_DIR}/cpp/rnskia/RNSkJsView.cpp"
20-        "${PROJECT_SOURCE_DIR}/cpp/rnskia/RNSkDomView.cpp"
21-        "${PROJECT_SOURCE_DIR}/cpp/rnskia/RNSkDispatchQueue.cpp"
22+        "${PROJECT_SOURCE_DIR}/../cpp/rnskia/RNSkManager.cpp"
23+        "${PROJECT_SOURCE_DIR}/../cpp/rnskia/RNSkJsView.cpp"
24+        "${PROJECT_SOURCE_DIR}/../cpp/rnskia/RNSkDomView.cpp"
25+        "${PROJECT_SOURCE_DIR}/../cpp/rnskia/RNSkDispatchQueue.cpp"
26
27-        "${PROJECT_SOURCE_DIR}/cpp/rnskia/dom/base/DrawingContext.cpp"
28-        "${PROJECT_SOURCE_DIR}/cpp/rnskia/dom/base/ConcatablePaint.cpp"
29+        "${PROJECT_SOURCE_DIR}/../cpp/rnskia/dom/base/DrawingContext.cpp"
30+        "${PROJECT_SOURCE_DIR}/../cpp/rnskia/dom/base/ConcatablePaint.cpp"
31
32-        "${PROJECT_SOURCE_DIR}/cpp/api/third_party/CSSColorParser.cpp"
33+        "${PROJECT_SOURCE_DIR}/../cpp/api/third_party/CSSColorParser.cpp"
34
35 )
36
37@@ -75,33 +75,33 @@ target_include_directories(
38         "${NODE_MODULES_DIR}/react-native/ReactCommon/react/nativemodule/core"
39         "${NODE_MODULES_DIR}/react-native/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni"
40
41-        cpp/skia/include/config/
42-        cpp/skia/include/core/
43-        cpp/skia/include/effects/
44-        cpp/skia/include/utils/
45-        cpp/skia/include/pathops/
46-        cpp/skia/modules/
47+        ${PROJECT_SOURCE_DIR}/../cpp/skia/include/config/
48+        ${PROJECT_SOURCE_DIR}/../cpp/skia/include/core/
49+        ${PROJECT_SOURCE_DIR}/../cpp/skia/include/effects/
50+        ${PROJECT_SOURCE_DIR}/../cpp/skia/include/utils/
51+        ${PROJECT_SOURCE_DIR}/../cpp/skia/include/pathops/
52+        ${PROJECT_SOURCE_DIR}/../cpp/skia/modules/
53         #cpp/skia/modules/skparagraph/include/
54-        cpp/skia/include/
55-        cpp/skia
56-
57-        cpp/api
58-        cpp/jsi
59-        cpp/jni/include
60-        cpp/rnskia-android
61-        cpp/rnskia
62-        cpp/rnskia/values
63-        cpp/rnskia/dom
64-        cpp/rnskia/dom/base
65-        cpp/rnskia/dom/nodes
66-        cpp/rnskia/dom/props
67-        cpp/utils
68+        ${PROJECT_SOURCE_DIR}/../cpp/skia/include/
69+        ${PROJECT_SOURCE_DIR}/../cpp/skia
70+
71+        ${PROJECT_SOURCE_DIR}/../cpp/api
72+        ${PROJECT_SOURCE_DIR}/../cpp/jsi
73+        ${PROJECT_SOURCE_DIR}/cpp/jni/include
74+        ${PROJECT_SOURCE_DIR}/cpp/rnskia-android
75+        ${PROJECT_SOURCE_DIR}/../cpp/rnskia
76+        ${PROJECT_SOURCE_DIR}/../cpp/rnskia/values
77+        ${PROJECT_SOURCE_DIR}/../cpp/rnskia/dom
78+        ${PROJECT_SOURCE_DIR}/../cpp/rnskia/dom/base
79+        ${PROJECT_SOURCE_DIR}/../cpp/rnskia/dom/nodes
80+        ${PROJECT_SOURCE_DIR}/../cpp/rnskia/dom/props
81+        ${PROJECT_SOURCE_DIR}/../cpp/utils
82
83         ${libfbjni_include_DIRS}
84 )
85
86 # Import prebuilt SKIA libraries
87-set (SKIA_LIBS_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../libs/android/${ANDROID_ABI}")
88+set (SKIA_LIBS_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../../../common/libs/${ANDROID_ABI}")
89
90 add_library(skia STATIC IMPORTED)
91 set_property(TARGET skia PROPERTY IMPORTED_LOCATION "${SKIA_LIBS_PATH}/libskia.a")
92--- android/build.gradle
93+++ android/build.gradle
94@@ -48,7 +48,7 @@ static def findNodeModules(baseDir) {
95   throw new GradleException("React-Native-Skia: Failed to find node_modules/ path!")
96 }
97
98-def nodeModules = findNodeModules(projectDir)
99+def nodeModules = Paths.get(projectDir.getPath(), '../../../../../..', 'react-native-lab/react-native/packages').toString()
100 logger.warn("react-native-skia: node_modules/ found at: ${nodeModules}")
101
102 def sourceBuild = false
103@@ -56,9 +56,9 @@ def defaultDir
104
105 if (rootProject.ext.has('reactNativeAndroidRoot')) {
106   defaultDir = rootProject.ext.get('reactNativeAndroidRoot')
107-} else if (findProject(':ReactAndroid') != null) {
108+} else if (findProject(':packages:react-native:ReactAndroid') != null) {
109     sourceBuild = true
110-    defaultDir = project(':ReactAndroid').projectDir
111+    defaultDir = project(':packages:react-native:ReactAndroid').projectDir
112 } else {
113   defaultDir = file("$nodeModules/react-native")
114 }
115