From: Xavier Ducrohet <xav@android.com>
Date: Fri, 7 Oct 2011 02:23:33 +0000 (-0700)
Subject: Cherrypick 26d92b from master for r14. do not merge.
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=cde8474ebe87533a45c250297097e908b1f4e238;p=android-x86%2Fsdk.git

Cherrypick 26d92b from master for r14. do not merge.

Ant build didn't use -non-constant-id for libraries!

Change-Id: I6dffc58d68cf93bad73c419fbf38ee2d0be2dfb0
---

diff --git a/anttasks/src/com/android/ant/AaptExecTask.java b/anttasks/src/com/android/ant/AaptExecTask.java
index fc0de712b..504640b28 100644
--- a/anttasks/src/com/android/ant/AaptExecTask.java
+++ b/anttasks/src/com/android/ant/AaptExecTask.java
@@ -92,6 +92,7 @@ public final class AaptExecTask extends BaseTask {
     private final ArrayList<NoCompress> mNoCompressList = new ArrayList<NoCompress>();
     private String mProjectLibrariesResName;
     private String mProjectLibrariesPackageName;
+    private boolean mNonConstantId;
 
     /**
      * Sets the value of the "executable" attribute.
@@ -133,6 +134,10 @@ public final class AaptExecTask extends BaseTask {
         mUseCrunchCache = nocrunch;
     }
 
+    public void setNonConstantId(boolean nonConstantId) {
+        mNonConstantId = nonConstantId;
+    }
+
     public void setVersioncode(String versionCode) {
         if (versionCode.length() > 0) {
             try {
@@ -415,6 +420,10 @@ public final class AaptExecTask extends BaseTask {
             task.createArg().setValue("--no-crunch");
         }
 
+        if (mNonConstantId) {
+            task.createArg().setValue("--non-constant-id");
+        }
+
         // force flag
         if (mForce) {
             task.createArg().setValue("-f");
diff --git a/files/ant/build.xml b/files/ant/build.xml
index 134a0a33d..9315a5ed3 100644
--- a/files/ant/build.xml
+++ b/files/ant/build.xml
@@ -563,6 +563,7 @@
                     manifest="AndroidManifest.xml"
                     androidjar="${android.jar}"
                     rfolder="${gen.absolute.dir}"
+                    nonConstantId="${android.library}"
                     projectLibrariesResName="project.libraries.res"
                     projectLibrariesPackageName="project.libraries.package">
                 <res path="${resource.absolute.dir}" />