patch strings.xml for qt/android

1 files changed, 16 insertions, 0 deletions

diff --git a/xmake/rules/qt/deploy/android.lua b/xmake/rules/qt/deploy/android.lua
index e682c45a0..a4c6b621e 100644
--- a/xmake/rules/qt/deploy/android.lua
+++ b/xmake/rules/qt/deploy/android.lua
@@ -111,6 +111,18 @@ function main(target, opt)
         os.cp(target:targetfile(), path.join(android_buildir, "libs", target_arch, path.filename(target:targetfile())))
     end
 
+    -- get the android srcs directory, e.g. android-build/java/res/values
+    local android_srcs
+    if qt_sdkver and qt_sdkver:ge("5.14") then
+        -- @note we need patch values/res/strings.xml for Qt 5.14.0
+        local valuesdir = path.join(android_buildir, "java", "res", "values")
+        if not os.isdir(valuesdir) then
+            os.mkdir(valuesdir)
+        end
+        os.cp(path.join(qt.sdkdir, "src", "android", "java", "res", "values", "*"), valuesdir)
+        android_srcs = path.join(android_buildir, "java")
+    end
+
     -- get stdcpp path
     local stdcpp_path = path.join(ndk, "sources/cxx-stl/llvm-libc++/libs", target_arch, "libc++_shared.so")
     if qt_sdkver and qt_sdkver:ge("5.14") then
@@ -138,6 +150,10 @@ function main(target, opt)
         settings_file:print('   "ndk-host": "%s",', ndk_host)
         settings_file:print('   "target-architecture": "%s",', target_arch)
         settings_file:print('   "qml-root-path": "%s",', _escape_path(os.projectdir()))
+        if android_srcs then
+            settings_file:print('   "android-package-source-directory": "%s",', _escape_path(android_srcs))
+            --settings_file:print('   "android-extra-libs":"c:/libs",')
+        end
         settings_file:print('   "useLLVM": true,')
         if qt_sdkver and qt_sdkver:ge("5.14") then
             -- @see https://codereview.qt-project.org/c/qt-creator/qt-creator/+/287145