Merge pull request livecode#7179 from livecodepanos/bugfix-22388

livecodepanos · web-flow · commit d0bf6efca41c · 2019-12-17T12:18:04.000+02:00
[22388] Add support for merging activity attributes in manifest
diff --git a/docs/notes/bugfix-22388.md b/docs/notes/bugfix-22388.md
@@ -0,0 +1 @@
+# Add support for merging activity attributes in Android Manifest Merging mechanism
diff --git a/ide-support/revsaveasandroidstandalone.livecodescript b/ide-support/revsaveasandroidstandalone.livecodescript
@@ -1829,6 +1829,18 @@ command MergeManifestArray @xManifestArrayA, pAdditionalsA
             put max(tExisting, tNew) into \
                   xManifestArrayA[tUsesSDKIndex]["@attributes"]["android:minSDKVersion"]
             break
+         case "activity"
+            local tActivityIndex
+            put FindIndex(xManifestArrayA, "activity") into tActivityIndex
+            local tExistingA, tNewA
+            put xManifestArrayA[tActivityIndex]["@attributes"] \
+                  into tExistingA
+            put tData["@attributes"] into tNewA
+            repeat for each line tKey in the keys of tNewA
+               put tNewA[tKey] after tExistingA[tKey]
+            end repeat
+            put tExistingA into xManifestArrayA[tActivityIndex]["@attributes"]
+            break
          default
             insertIntoList tData, xManifestArrayA, tEndOfBlock
             add 1 to tEndOfBlock

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Add support for merging activity attributes in Android Manifest Merging mechanism`