Update conan asset gathering logic

opendocument-app · Aug 26, 2024 · 18dbfdd · 18dbfdd
1 parent 2cbd1a2
commit 18dbfdd
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 14 deletions.
diff --git a/wvWare/CMakeLists.txt b/wvWare/CMakeLists.txt
@@ -21,13 +21,3 @@ project(wvWare-Android)
 find_package(wvware REQUIRED CONFIG)
 
 add_subdirectory(src/main/cpp)
-
-FILE(MAKE_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/build/assets")
-function(copy_assets sourcevar dstsubdir)
-  if(DEFINED "${sourcevar}")
-    FILE(REMOVE_RECURSE "${CMAKE_CURRENT_LIST_DIR}/build/assets/${dstsubdir}")
-    FILE(CREATE_LINK "${${sourcevar}}" "${CMAKE_CURRENT_LIST_DIR}/build/assets/${dstsubdir}" COPY_ON_ERROR SYMBOLIC)
-  endif()
-endfunction()
-
-copy_assets("WVWARE_RES_DIR" "wv")
diff --git a/wvWare/build.gradle b/wvWare/build.gradle
@@ -68,17 +68,17 @@ android {
         version "3.22.1"
     }
     ndkVersion '26.3.11579264'
-    sourceSets.main.assets.srcDirs += "build/assets"
+    sourceSets.main.assets.srcDirs += "build/conan/armv8/assets"
     sourceSets.androidTest.assets.srcDirs = [ getProject().parent.getLayout().getProjectDirectory().dir("test/androidTestAssets") ]
 }
 
 // Assets delivered by conan are gathered by CMake
 afterEvaluate {
     tasks.named("generateDebugAssets").configure {
-        dependsOn(tasks.named("mergeDebugNativeLibs"))
+        dependsOn(tasks.named("conanInstall-armv8"))
     }
     tasks.named("generateReleaseAssets").configure {
-        dependsOn(tasks.named("mergeReleaseNativeLibs"))
+        dependsOn(tasks.named("conanInstall-armv8"))
     }
 }
 

diff --git a/wvWare/conanfile.py b/wvWare/conanfile.py
@@ -1,3 +1,5 @@
+import os
+
 from conan import ConanFile
 from conan.tools.cmake import CMakeToolchain, CMakeDeps
 
@@ -12,5 +14,8 @@ def generate(self):
         deps = CMakeDeps(self)
         deps.generate()
         tc = CMakeToolchain(self)
-        tc.variables["WVWARE_RES_DIR"] = self.dependencies['wvware'].cpp_info.resdirs[0]
         tc.generate()
+
+        asset_dir = os.path.join(self.build_folder, 'assets')
+        os.mkdir(asset_dir)
+        os.symlink(self.dependencies['wvware'].cpp_info.resdirs[0], os.path.join(asset_dir, 'wv'))