aboutsummaryrefslogtreecommitdiffstats
path: root/files/ant/build.xml
diff options
context:
space:
mode:
Diffstat (limited to 'files/ant/build.xml')
-rw-r--r--files/ant/build.xml4
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>