diff options
| author | Xavier Ducrohet <xav@android.com> | 2011-10-06 19:24:42 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-10-06 19:24:42 -0700 |
| commit | 1b632250de5ab83959a2a3565ed7b0f6df7eb016 (patch) | |
| tree | 1f0ad0c86e5e44a8785f8b94fdf00d328cdf5421 | |
| parent | d8ba72b6947d9212e63c7e9a987e1f4245fcbe83 (diff) | |
| parent | 26d92b7f8a7b8a32352f52a676f486c06e5b82c8 (diff) | |
| download | sdk-1b632250de5ab83959a2a3565ed7b0f6df7eb016.zip sdk-1b632250de5ab83959a2a3565ed7b0f6df7eb016.tar.gz sdk-1b632250de5ab83959a2a3565ed7b0f6df7eb016.tar.bz2 | |
Merge "Ant build didn't use -non-constant-id for libraries!"
| -rw-r--r-- | anttasks/src/com/android/ant/AaptExecTask.java | 9 | ||||
| -rw-r--r-- | files/ant/build.xml | 1 |
2 files changed, 10 insertions, 0 deletions
diff --git a/anttasks/src/com/android/ant/AaptExecTask.java b/anttasks/src/com/android/ant/AaptExecTask.java index fc0de71..504640b 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 134a0a3..9315a5e 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}" /> |