diff options
| author | Xavier Ducrohet <xav@android.com> | 2012-04-23 17:16:04 -0700 |
|---|---|---|
| committer | Xavier Ducrohet <xav@android.com> | 2012-04-23 17:16:04 -0700 |
| commit | e6ec57d99bfda23f18ec7ec27022c5321b7368e5 (patch) | |
| tree | a33defb5920450bb4421c61b60de5c35cc953b1a /files/ant | |
| parent | 3b7b3c0cc33462c7eebae6fbd7f5e994625b9011 (diff) | |
| download | sdk-e6ec57d99bfda23f18ec7ec27022c5321b7368e5.zip sdk-e6ec57d99bfda23f18ec7ec27022c5321b7368e5.tar.gz sdk-e6ec57d99bfda23f18ec7ec27022c5321b7368e5.tar.bz2 | |
Revert the disable flag of the manifest merger to be enable instead.
Change-Id: I4f89b469e06f741b95b92d7a4826f979c64dab1b
Diffstat (limited to 'files/ant')
| -rw-r--r-- | files/ant/build.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/files/ant/build.xml b/files/ant/build.xml index db0fd43..0c5b9ea 100644 --- a/files/ant/build.xml +++ b/files/ant/build.xml @@ -57,7 +57,7 @@ <property name="renderscript.release.opt.level" value="O3" /> <!-- manifest merger default value --> - <property name="manifestmerger.disable" value="true" /> + <property name="manifestmerger.enabled" value="false" /> <!-- instrumentation options --> <property name="emma.filter" value="" /> @@ -599,7 +599,7 @@ <mergemanifest appManifest="${manifest.abs.file}" outManifest="${out.manifest.abs.file}" - disable="${manifestmerger.disable}"> + enabled="${manifestmerger.enabled}"> <library refid="project.library.manifest.file.path" /> </mergemanifest> |