Feat: Build fused modules manifest attribute REAndroid/APKEditor#186

Author: REAndroid

src/main/java/com/reandroid/apk/ApkModule.java

@@ -44,6 +44,7 @@
 import com.reandroid.arsc.value.Entry;
 import com.reandroid.arsc.value.ResConfig;
 import com.reandroid.identifiers.PackageIdentifier;
+import com.reandroid.utils.StringsUtil;
 import com.reandroid.utils.collection.ArrayCollection;
 import com.reandroid.utils.collection.CollectionUtil;
 import com.reandroid.xml.XMLDocument;
@@ -1228,6 +1229,29 @@ public void merge(ApkModule module, boolean force) throws IOException {
         mergeTable(module);
         mergeFiles(module);
         getUncompressedFiles().merge(module.getUncompressedFiles());
+        mergeFusedModules(module);
+    }
+    private void mergeFusedModules(ApkModule module) {
+        if (!this.hasAndroidManifest() || !module.hasAndroidManifest()) {
+            return;
+        }
+        AndroidManifestBlock baseManifest = this.getAndroidManifest();
+        AndroidManifestBlock manifest = module.getAndroidManifest();
+        if (!manifest.isFusingInclude()) {
+            return;
+        }
+        logMessage("Merging fused module: " + module.getModuleName());
+        String[] fusedModules = manifest.getFusedModules();
+        if (fusedModules != null && fusedModules.length != 0) {
+            baseManifest.addFusedModules(fusedModules);
+            logMessage("Fused modules added [" +
+                    StringsUtil.join(fusedModules, ',') + "]");
+        }
+        String split = manifest.getSplit();
+        if (split != null) {
+            baseManifest.addFusedModules(split);
+            logMessage("Added as fused module <" + split + ">");
+        }
     }
     private void validateMerge(ApkModule apkModule, boolean force) throws IOException{
         if (!hasTableBlock()) {

src/main/java/com/reandroid/app/AndroidManifest.java

@@ -154,6 +154,7 @@ default void setCompileSdk(AndroidApiLevel apiLevel){
     String TAG_uses_sdk = ObjectsUtil.of("uses-sdk");
 
     String VALUE_android_intent_action_MAIN = ObjectsUtil.of("android.intent.action.MAIN");
+    String VALUE_com_android_dynamic_apk_fused_modules = ObjectsUtil.of("com.android.dynamic.apk.fused.modules");
 
     String FILE_NAME = ObjectsUtil.of("AndroidManifest.xml");
     String FILE_NAME_BIN = ObjectsUtil.of("AndroidManifest.xml.bin");

src/main/java/com/reandroid/arsc/chunk/xml/AndroidManifestBlock.java

@@ -23,13 +23,18 @@
 import com.reandroid.arsc.model.ResourceEntry;
 import com.reandroid.arsc.value.ValueType;
 import com.reandroid.utils.ObjectsUtil;
-import com.reandroid.utils.collection.*;
+import com.reandroid.utils.StringsUtil;
+import com.reandroid.utils.collection.ArrayCollection;
+import com.reandroid.utils.collection.CollectionUtil;
+import com.reandroid.utils.collection.CombiningIterator;
+import com.reandroid.utils.collection.ComputeIterator;
 
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Iterator;
 import java.util.List;
+import java.util.function.Predicate;
 
 @SuppressWarnings("unused")
 public class AndroidManifestBlock extends ResXmlDocument implements AndroidManifest {
@@ -101,6 +106,78 @@ public void setSplit(String split, boolean forceCreate) {
         }
         attribute.setValueAsString(split);
     }
+
+    /**
+     * Returns "include" value from split manifest
+     *
+     * e.g.
+     * <dist:module type="asset-pack">
+     *     <dist:fusing include="true" />
+     * </dist:module>
+     */
+    public boolean isFusingInclude() {
+        ResXmlElement manifestElement = getManifestElement();
+        if (manifestElement != null) {
+            Iterator<ResXmlElement> modules = manifestElement.getElements("module");
+            while (modules.hasNext()) {
+                Iterator<ResXmlElement> iterator = modules.next().getElements("fusing");
+                while (iterator.hasNext()) {
+                    ResXmlAttribute attribute = iterator.next()
+                            .searchAttributeByName("include");
+                    if (attribute != null && attribute.getValueType() == ValueType.BOOLEAN) {
+                        return attribute.getValueAsBoolean();
+                    }
+                }
+            }
+        }
+        return false;
+    }
+    public String[] getFusedModules() {
+        ResXmlElement manifestElement = getManifestElement();
+        if (manifestElement != null) {
+            ResXmlElement metaData = CollectionUtil.getFirst(
+                    manifestElement.getElements(PREDICATE_FUSED_MODULES));
+            if (metaData != null) {
+                ResXmlAttribute attribute = metaData.searchAttributeByResourceId(ID_value);
+                if (attribute != null && attribute.getValueType() == ValueType.STRING) {
+                    return StringsUtil.split(attribute.getValueAsString(), ',');
+                }
+            }
+        }
+        return null;
+    }
+    public void addFusedModules(String ... names) {
+        if (names == null || names.length == 0) {
+            return;
+        }
+        ResXmlElement manifestElement = getOrCreateManifestElement();
+        ResXmlElement metaData = CollectionUtil.getFirst(
+                manifestElement.getElements(PREDICATE_FUSED_MODULES));
+        if (metaData == null) {
+            metaData = manifestElement.newElement(TAG_meta_data);
+            metaData.getOrCreateAndroidAttribute(NAME_name, ID_name)
+                    .setValueAsString(VALUE_com_android_dynamic_apk_fused_modules);
+        }
+        ResXmlAttribute attribute = metaData.getOrCreateAndroidAttribute(NAME_value, ID_value);
+        ArrayCollection<String> nameList = new ArrayCollection<>();
+        String value = attribute.getValueAsString();
+        if (value != null) {
+            nameList.addAll(StringsUtil.split(value, ','));
+        }
+        for (String name : names) {
+            if (!StringsUtil.isEmpty(name) && !nameList.contains(name)) {
+                nameList.add(name);
+            }
+        }
+        attribute.setValueAsString(StringsUtil.join(nameList, ','));
+    }
+    public boolean clearFusedModules() {
+        ResXmlElement manifestElement = getManifestElement();
+        if (manifestElement != null) {
+            return manifestElement.removeElementsIf(PREDICATE_FUSED_MODULES);
+        }
+        return false;
+    }
     // TODO: find a better way
     public int guessCurrentPackageId() {
         if (mGuessedPackageId == 0) {
@@ -700,4 +777,9 @@ public static AndroidManifestBlock empty() {
         manifestBlock.getOrCreateElement(EMPTY_MANIFEST_TAG);
         return manifestBlock;
     }
+
+    public static final Predicate<ResXmlElement> PREDICATE_FUSED_MODULES = element ->
+            element.equalsName(TAG_meta_data) &&
+            VALUE_com_android_dynamic_apk_fused_modules.equals(
+                    getAndroidNameValue(element));
 }