New log format for multi-apk export.

Also added support for supports-screens in the log,
and fixed supports-screens parsing.

Change-Id: I702fb511eb4da0094917d7c0d9fe792f582adeb2

1 files changed, 2 insertions, 16 deletions

diff --git a/anttasks/src/com/android/ant/MultiApkExportTask.java b/anttasks/src/com/android/ant/MultiApkExportTask.java
index 3d1131b..151b81b 100644
--- a/anttasks/src/com/android/ant/MultiApkExportTask.java
+++ b/anttasks/src/com/android/ant/MultiApkExportTask.java
@@ -165,8 +165,8 @@ public class MultiApkExportTask extends Task {
                     }
 
                     // set the version code, and filtering
-                    String compositeVersionCode = getVersionCodeString(versionCode, apk);
-                    addProp(subAnt, "version.code", compositeVersionCode);
+                    int compositeVersionCode = apk.getCompositeVersionCode(versionCode);
+                    addProp(subAnt, "version.code", Integer.toString(compositeVersionCode));
                     System.out.println("Composite versionCode: " + compositeVersionCode);
                     String abi = apk.getAbi();
                     if (abi != null) {
@@ -279,20 +279,6 @@ public class MultiApkExportTask extends Task {
     }
 
     /**
-     * Computes and returns the composite version code
-     * @param versionCode the major version code.
-     * @param apkData the apk data.
-     * @return the composite versionCode to be used in the manifest.
-     */
-    private String getVersionCodeString(int versionCode, ApkData apkData) {
-        int trueVersionCode = versionCode * MultiApkExportHelper.OFFSET_VERSION_CODE;
-        trueVersionCode += apkData.getBuildInfo() * MultiApkExportHelper.OFFSET_BUILD_INFO;
-        trueVersionCode += apkData.getMinor();
-
-        return Integer.toString(trueVersionCode);
-    }
-
-    /**
      * Returns the {@link File} for the build log.
      * @param appPackage
      * @param versionCode