From e6ec57d99bfda23f18ec7ec27022c5321b7368e5 Mon Sep 17 00:00:00 2001
From: Xavier Ducrohet <xav@android.com>
Date: Mon, 23 Apr 2012 17:16:04 -0700
Subject: Revert the disable flag of the manifest merger to be enable instead.

Change-Id: I4f89b469e06f741b95b92d7a4826f979c64dab1b
---
 anttasks/src/com/android/ant/ManifestMergerTask.java | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'anttasks/src')

diff --git a/anttasks/src/com/android/ant/ManifestMergerTask.java b/anttasks/src/com/android/ant/ManifestMergerTask.java
index ead564c..a20df4e 100644
--- a/anttasks/src/com/android/ant/ManifestMergerTask.java
+++ b/anttasks/src/com/android/ant/ManifestMergerTask.java
@@ -34,7 +34,7 @@ public class ManifestMergerTask extends SingleDependencyTask {
     private String mOutManifest;
 
     private ArrayList<Path> mLibraryPaths;
-    private boolean mDisable = true;
+    private boolean mEnabled = false;
 
     public void setAppManifest(Path appManifest) {
         mAppManifest = TaskHelper.checkSinglePath("appManifest", appManifest);
@@ -44,8 +44,8 @@ public class ManifestMergerTask extends SingleDependencyTask {
         mOutManifest = TaskHelper.checkSinglePath("outManifest", outManifest);
     }
 
-    public void setDisable(boolean disable) {
-        mDisable  = disable;
+    public void setEnable(boolean enabled) {
+        mEnabled  = enabled;
     }
 
     /**
@@ -88,8 +88,8 @@ public class ManifestMergerTask extends SingleDependencyTask {
         File appManifestFile = new File(mAppManifest);
         allInputs.add(appManifestFile);
 
-        // if not disabled, the libraries
-        if (mDisable == false) {
+        // if enabled: add the libraries
+        if (mEnabled) {
             allInputs.addAll(libraries);
         }
 
@@ -108,8 +108,8 @@ public class ManifestMergerTask extends SingleDependencyTask {
 
         System.out.println("Merging AndroidManifest files into one.");
 
-        if (mDisable || libraries.size() == 0) {
-            if (mDisable) {
+        if (mEnabled == false || libraries.size() == 0) {
+            if (mEnabled == false) {
                 System.out.println("Manifest merger disabled. Using project manifest only.");
             } else {
                 System.out.println("No libraries. Using project manifest only.");
-- 
cgit v1.1