Merge remote-tracking branch 'upstream/release-9.6.0' into merge-release-9.6.0-03.08.2020

livecodepanos · livecodepanos · commit ff2aab99cd63 · 2020-08-03T07:47:15.000+03:00
diff --git a/docs/notes/bugfix-22737.md b/docs/notes/bugfix-22737.md
@@ -0,0 +1 @@
+# Make sure the externals lcextd folder is not copied into the apk
diff --git a/ide-support/revsaveasandroidstandalone.livecodescript b/ide-support/revsaveasandroidstandalone.livecodescript
@@ -1297,7 +1297,9 @@ private command addAssetsToArchive pFileData, pBaseFolder, pArchive
             revZipAddUncompressedItemWithFile pArchive, "assets/" & tFile["name"], tFile["resolved"]
          end if
       else if there is a folder tFile["resolved"] then
-         addAssetsFromFolderToArchive tFile["resolved"], "assets" & slash & tFile["name"], pArchive, tFonts
+         if not (tFile["resolved"] ends with ".lcextd") then
+            addAssetsFromFolderToArchive tFile["resolved"], "assets" & slash & tFile["name"], pArchive, tFonts
+         end if
       else
          throw "could not find referenced asset to include -" && tFile["resolved"]
       end if

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Make sure the externals lcextd folder is not copied into the apk`