Return-Path: 
 <commits-return-21817-apmail-cordova-commits-archive=cordova.apache.org@cordova.apache.org>
X-Original-To: apmail-cordova-commits-archive@www.apache.org
Delivered-To: apmail-cordova-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id A5E4410D39
	for <apmail-cordova-commits-archive@www.apache.org>;
 Sun, 26 Jan 2014 03:00:37 +0000 (UTC)
Received: (qmail 98254 invoked by uid 500); 26 Jan 2014 03:00:37 -0000
Delivered-To: apmail-cordova-commits-archive@cordova.apache.org
Received: (qmail 98191 invoked by uid 500); 26 Jan 2014 03:00:37 -0000
Mailing-List: contact commits-help@cordova.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cordova.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cordova.apache.org>
List-Post: <mailto:commits@cordova.apache.org>
List-Id: <commits.cordova.apache.org>
Reply-To: dev@cordova.apache.org
Delivered-To: mailing list commits@cordova.apache.org
Received: (qmail 98184 invoked by uid 99); 26 Jan 2014 03:00:36 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 26 Jan 2014 03:00:36 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id 8A1D0905C5E; Sun, 26 Jan 2014 03:00:36 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: agrieve@apache.org
To: commits@cordova.apache.org
Message-Id: <6c5328aac04c48858037cb6891fb4ee1@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: android commit: CB-5793 ant builds: Rename AndroidManifest during
 -post-build to avoid Eclipse detecting ant-build/ as a project when importing
Date: Sun, 26 Jan 2014 03:00:36 +0000 (UTC)

Updated Branches:
  refs/heads/3.4.x 06660383e -> 029d1561d


CB-5793 ant builds: Rename AndroidManifest during -post-build to avoid Eclipse detecting ant-build/ as a project when importing


Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/029d1561
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/029d1561
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/029d1561

Branch: refs/heads/3.4.x
Commit: 029d1561dc61d7d2e7e4e3c0ca24f94b2fa40e50
Parents: 0666038
Author: Andrew Grieve <agrieve@chromium.org>
Authored: Sat Jan 25 21:58:28 2014 -0500
Committer: Andrew Grieve <agrieve@chromium.org>
Committed: Sat Jan 25 22:00:26 2014 -0500

----------------------------------------------------------------------
 bin/templates/project/custom_rules.xml | 4 ++++
 1 file changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-android/blob/029d1561/bin/templates/project/custom_rules.xml
----------------------------------------------------------------------
diff --git a/bin/templates/project/custom_rules.xml b/bin/templates/project/custom_rules.xml
index d0fedea..4b20e22 100644
--- a/bin/templates/project/custom_rules.xml
+++ b/bin/templates/project/custom_rules.xml
@@ -13,5 +13,9 @@
         </path>
         <echo message="Set jars path to: ${toString:project.all.jars.path}"/>
     </target>
+    <target name="-post-build">
+        <move file="ant-build/AndroidManifest.xml" tofile="ant-build/AndroidManifest.cordova.xml" failonerror="false" overwrite="true" />
+        <move file="CordovaLib/ant-build/AndroidManifest.xml" tofile="CordovaLib/ant-build/AndroidManifest.cordova.xml" failonerror="false" overwrite="true" />
+    </target>
 </project>