1--- android/CMakeLists.txt
2+++ android/CMakeLists.txt
3@@ -47,20 +47,20 @@
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/JsiHostObject.cpp"
12+        "${PROJECT_SOURCE_DIR}/../cpp/jsi/JsiValue.cpp"
13+        "${PROJECT_SOURCE_DIR}/../cpp/jsi/RuntimeLifecycleMonitor.cpp"
14+        "${PROJECT_SOURCE_DIR}/../cpp/jsi/RuntimeAwareCache.cpp"
15
16-        "${PROJECT_SOURCE_DIR}/cpp/rnskia/RNSkManager.cpp"
17-        "${PROJECT_SOURCE_DIR}/cpp/rnskia/RNSkJsView.cpp"
18-        "${PROJECT_SOURCE_DIR}/cpp/rnskia/RNSkDomView.cpp"
19-        "${PROJECT_SOURCE_DIR}/cpp/rnskia/RNSkDispatchQueue.cpp"
20+        "${PROJECT_SOURCE_DIR}/../cpp/rnskia/RNSkManager.cpp"
21+        "${PROJECT_SOURCE_DIR}/../cpp/rnskia/RNSkJsView.cpp"
22+        "${PROJECT_SOURCE_DIR}/../cpp/rnskia/RNSkDomView.cpp"
23+        "${PROJECT_SOURCE_DIR}/../cpp/rnskia/RNSkDispatchQueue.cpp"
24
25-        "${PROJECT_SOURCE_DIR}/cpp/rnskia/dom/base/DrawingContext.cpp"
26-        "${PROJECT_SOURCE_DIR}/cpp/rnskia/dom/base/ConcatablePaint.cpp"
27+        "${PROJECT_SOURCE_DIR}/../cpp/rnskia/dom/base/DrawingContext.cpp"
28+        "${PROJECT_SOURCE_DIR}/../cpp/rnskia/dom/base/ConcatablePaint.cpp"
29
30-        "${PROJECT_SOURCE_DIR}/cpp/api/third_party/CSSColorParser.cpp"
31+        "${PROJECT_SOURCE_DIR}/../cpp/api/third_party/CSSColorParser.cpp"
32
33 )
34
35@@ -74,33 +74,33 @@
36         "${NODE_MODULES_DIR}/react-native/ReactCommon/react/nativemodule/core"
37         "${NODE_MODULES_DIR}/react-native/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni"
38
39-        cpp/skia/include/config/
40-        cpp/skia/include/core/
41-        cpp/skia/include/effects/
42-        cpp/skia/include/utils/
43-        cpp/skia/include/pathops/
44-        cpp/skia/modules/
45+        ${PROJECT_SOURCE_DIR}/../cpp/skia/include/config/
46+        ${PROJECT_SOURCE_DIR}/../cpp/skia/include/core/
47+        ${PROJECT_SOURCE_DIR}/../cpp/skia/include/effects/
48+        ${PROJECT_SOURCE_DIR}/../cpp/skia/include/utils/
49+        ${PROJECT_SOURCE_DIR}/../cpp/skia/include/pathops/
50+        ${PROJECT_SOURCE_DIR}/../cpp/skia/modules/
51         #cpp/skia/modules/skparagraph/include/
52-        cpp/skia/include/
53-        cpp/skia
54+        ${PROJECT_SOURCE_DIR}/../cpp/skia/include/
55+        ${PROJECT_SOURCE_DIR}/../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/api
69+        ${PROJECT_SOURCE_DIR}/../cpp/jsi
70+        ${PROJECT_SOURCE_DIR}/cpp/jni/include
71+        ${PROJECT_SOURCE_DIR}/cpp/rnskia-android
72+        ${PROJECT_SOURCE_DIR}/../cpp/rnskia
73+        ${PROJECT_SOURCE_DIR}/../cpp/rnskia/values
74+        ${PROJECT_SOURCE_DIR}/../cpp/rnskia/dom
75+        ${PROJECT_SOURCE_DIR}/../cpp/rnskia/dom/base
76+        ${PROJECT_SOURCE_DIR}/../cpp/rnskia/dom/nodes
77+        ${PROJECT_SOURCE_DIR}/../cpp/rnskia/dom/props
78+        ${PROJECT_SOURCE_DIR}/../cpp/utils
79
80         ${libfbjni_include_DIRS}
81 )
82
83 # Import prebuilt SKIA libraries
84-set (SKIA_LIBS_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../libs/android/${ANDROID_ABI}")
85+set (SKIA_LIBS_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../../../common/libs/${ANDROID_ABI}")
86
87 add_library(skia STATIC IMPORTED)
88 set_property(TARGET skia PROPERTY IMPORTED_LOCATION "${SKIA_LIBS_PATH}/libskia.a")
89--- android/build.gradle
90+++ android/build.gradle
91@@ -48,7 +48,7 @@
92   throw new GradleException("React-Native-Skia: Failed to find node_modules/ path!")
93 }
94
95-def nodeModules = findNodeModules(projectDir)
96+def nodeModules = Paths.get(projectDir.getPath(), '../../../../../..', 'react-native-lab/react-native/packages').toString()
97 logger.warn("react-native-skia: node_modules/ found at: ${nodeModules}")
98
99 def sourceBuild = false
100@@ -56,9 +56,9 @@
101
102 if (rootProject.ext.has('reactNativeAndroidRoot')) {
103   defaultDir = rootProject.ext.get('reactNativeAndroidRoot')
104-} else if (findProject(':ReactAndroid') != null) {
105+} else if (findProject(':packages:react-native:ReactAndroid') != null) {
106     sourceBuild = true
107-    defaultDir = project(':ReactAndroid').projectDir
108+    defaultDir = project(':packages:react-native:ReactAndroid').projectDir
109 } else {
110   defaultDir = file("$nodeModules/react-native")
111 }
112@@ -222,27 +222,6 @@
113     }
114 }
115
116-afterEvaluate { project ->
117-    task androidSourcesJar(type: Jar) {
118-        classifier = 'sources'
119-        from android.sourceSets.main.java.srcDirs
120-        include '**/*.java'
121-    }
122-
123-    android.libraryVariants.all { variant ->
124-        def name = variant.name.capitalize()
125-        def javaCompileTask = variant.javaCompileProvider.get()
126-
127-        task "jar${name}"(type: Jar, dependsOn: javaCompileTask) {
128-            from javaCompileTask.destinationDir
129-        }
130-    }
131-
132-    artifacts {
133-        archives androidSourcesJar
134-    }
135-}
136-
137 task extractAARHeaders {
138     doLast {
139         configurations.extractHeaders.files.each {
140