diff --git a/android/CMakeLists.txt b/android/CMakeLists.txt
index 428bce05..ac2b7910 100644
--- a/android/CMakeLists.txt
+++ b/android/CMakeLists.txt
@@ -2,20 +2,19 @@ cmake_minimum_required(VERSION 3.4.1)
 
 include_directories(../ios/src)
 include_directories(../ios/include)
+include_directories(../ios/include/stb)
 include_directories(src/main/cpp)
-link_directories(src/main/libs/${ANDROID_ABI}) # don't use jniLibs here because we just want to link against these libraries, the actual .so files will be copied by the AAR dependencies
+link_directories(src/main/jniLibs/${ANDROID_ABI}) 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
 add_library( 
             filament_interop
             SHARED
-            src/main/cpp/filament_api.cpp
+            src/main/cpp/filament_android.cpp
+            src/main/cpp/KtxReader1.cpp
+            src/main/cpp/StbProvider.cpp
+            src/main/cpp/JobSystem.cpp
             ../ios/src/FilamentViewer.cpp
-            # ../ios/src/Utils.cpp
-            # ../ios/src/HDRLoader.cpp
-            # ../ios/include/common/NioUtils.cpp
-            #../ios/src/morph/GPUMorphHelper.cpp
         )
 
-
-target_link_libraries(filament_interop -landroid -llog -lfilament-jni -lfilament-utils-jni -lgltfio-jni )
+target_link_libraries(filament_interop -landroid -llog -lfilament -lbackend -lfilameshio -lviewer -lfilamat -lgeometry -lutils -lfilabridge -lgltfio_core -lfilament-iblprefilter -limage -lcamutils -lfilaflat -ldracodec -libl -lktxreader -lstb  -lEGL -lGLESv3 -lbluevk -lvkshaders -luberzlib -lsmol-v -luberarchive -lzstd)