Generate test apk with multi-container dex file V041

Author: REAndroid

src/test/java/com/reandroid/apk/ApkModuleTest.java

@@ -12,6 +12,7 @@
 import com.reandroid.arsc.chunk.xml.ResXmlAttribute;
 import com.reandroid.arsc.chunk.xml.ResXmlDocument;
 import com.reandroid.arsc.chunk.xml.ResXmlElement;
+import com.reandroid.arsc.coder.CoderDimension;
 import com.reandroid.arsc.coder.EncodeResult;
 import com.reandroid.arsc.coder.ValueCoder;
 import com.reandroid.arsc.io.BlockReader;
@@ -40,6 +41,9 @@
 
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 public class ApkModuleTest {
+
+    public static final boolean TEST_WITH_MULTI_LAYOUT_DEX_V041 = true;
+
     private static ApkModule last_apkModule;
     @Test
     public void a_testApkModule() throws IOException {
@@ -91,7 +95,10 @@ public ApkModule createApkModule() throws IOException {
         String appClass = manifestBlock.getApplicationClassName();
         String mainActivity = manifestBlock.getMainActivityClassName();
 
-        DexFile dexFile = SampleDexFileCreator.createApplicationClass(appClass, mainActivity, mainActivityLayoutId);
+        DexFile dexFile = SampleDexFileCreator.createApplicationClass(
+                TEST_WITH_MULTI_LAYOUT_DEX_V041,
+                appClass, mainActivity, mainActivityLayoutId);
+
         byte[] bytes = dexFile.getBytes();
         apkModule.add(new ByteInputSource(bytes, "classes.dex"));
         apkModule.getUncompressedFiles().addPath(apkModule.getZipEntryMap());
@@ -120,6 +127,9 @@ private int createMainActivityContentViewXml(ApkModule apkModule){
         attribute = root.getOrCreateAndroidAttribute("orientation", 0x010100c4);
         attribute.setTypeAndData(ValueType.DEC, 1); // vertical
 
+        attribute = root.getOrCreateAndroidAttribute("padding", 0x010100d5);
+        attribute.setValue(CoderDimension.INS.encode("20.0dp"));
+
         ResXmlElement textView = root.newElement("TextView");
         attribute = textView.getOrCreateAndroidAttribute("layout_width", 0x010100f4);
         attribute.setTypeAndData(ValueType.DEC, -1); // wrap_content
@@ -462,13 +472,17 @@ private AndroidManifestBlock createManifest() throws IOException {
 
         manifestBlock.setCompileSdkVersion(frameworkApk.getVersionCode());
         manifestBlock.setCompileSdkVersionCodename(frameworkApk.getVersionName());
-        manifestBlock.setCompileSdk(AndroidApiLevel.O);
+        AndroidApiLevel apiLevel = AndroidApiLevel.O;
+        if (TEST_WITH_MULTI_LAYOUT_DEX_V041) {
+            apiLevel = AndroidApiLevel.VANILLA_ICE_CREAM;
+        }
+        manifestBlock.setCompileSdk(apiLevel);
 
         manifestBlock.setPlatformBuildVersionCode(frameworkApk.getVersionCode());
         manifestBlock.setPlatformBuildVersionName(frameworkApk.getVersionName());
-        manifestBlock.setPlatformBuild(AndroidApiLevel.O);
-        manifestBlock.setMinSdkVersion(AndroidApiLevel.O.getApi());
-        manifestBlock.setTargetSdkVersion(AndroidApiLevel.O.getApi());
+        manifestBlock.setPlatformBuild(apiLevel);
+        manifestBlock.setMinSdkVersion(apiLevel.getApi());
+        manifestBlock.setTargetSdkVersion(apiLevel.getApi());
 
         manifestBlock.addUsesPermission("android.permission.INTERNET");
         manifestBlock.addUsesPermission("android.permission.READ_EXTERNAL_STORAGE");

src/test/java/com/reandroid/dex/SampleDexFileCreator.java

@@ -11,9 +11,17 @@
 public class SampleDexFileCreator {
 
     public static DexFile createApplicationClass(String appSourceName, String activitySourceName, int contentViewResourceId) throws IOException {
+        return createApplicationClass(false, appSourceName, activitySourceName, contentViewResourceId);
+    }
+    public static DexFile createApplicationClass(boolean multiContainerDex, String appSourceName, String activitySourceName, int contentViewResourceId) throws IOException {
         DexFile dexFile = DexFile.createDefault();
         createApplicationClass(dexFile, appSourceName);
-        createActivityClass(dexFile, activitySourceName, contentViewResourceId);
+        int i = 0;
+        if (multiContainerDex) {
+            dexFile.setVersion(41);
+            i = 1;
+        }
+        createActivityClass(dexFile.getOrCreateAt(i), activitySourceName, contentViewResourceId);
         dexFile.clearUnused();
         dexFile.clearEmptySections();
         dexFile.refreshFull();
@@ -31,8 +39,9 @@ private static void createApplicationClass(DexFile dexFile, String classSourceNa
 
         createConstructor(dexClass);
     }
-    private static void createActivityClass(DexFile dexFile, String activitySourceName, int contentViewResourceId) throws IOException {
-        DexClass dexClass = dexFile.getOrCreateFirst().getOrCreateClass(TypeKey.parse(activitySourceName));
+    private static void createActivityClass(DexLayout dexLayout, String activitySourceName, int contentViewResourceId) throws IOException {
+
+        DexClass dexClass = dexLayout.getOrCreateClass(TypeKey.parse(activitySourceName));
         dexClass.addAccessFlag(AccessFlag.PUBLIC);
         dexClass.setSuperClass(TypeKey.create("Landroid/app/Activity;"));