Fix the conflict of input and output manifest files

Fix the conflict of input and output manifest files

The ant building base dir is the same as the output directory. In SDK
r20, mergemanifest task will use the same file to do copying. As a
result, it will empty the manifest file - AndroidManifest.xml.

For the backward compatibility, fix it by copying input manifest file
into a new directory so the output manifest file is still in the ant
building base directory which could be used later by other tasks.

BUG=
TEST=


Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=146296

[yongsheng, 2012-07-11 05:33:54]

The native unittests apk gets build errors due to this conflict:
The reason is that the ant project base dir is the same as the output directory.
So it causes emptying the file 'AndroidManifest.xml'. See the below source code:

${ANDROID_SRC}/sdk/anttasks/src/com/android/ant/ManifestMergerTask.java
118             // no merge (disabled or nothing to merge)? do a simple copy.
119             try {
120                 new FileOp().copyFile(appManifestFile, new
File(mOutManifest));
121             } catch (IOException e) {
122                 throw new BuildException(e);
123             }

for backward compatibility(r19 needs AndroidManifest.xml under the project base
dir),  copy the input manifest file to a new file. 

Please review it. Thanks.

[yongsheng, 2012-07-11 05:45:29]

On 2012/07/11 05:33:54, yongsheng.zhu wrote:
> The native unittests apk gets build errors due to this conflict:
> The reason is that the ant project base dir is the same as the output
directory.
> So it causes emptying the file 'AndroidManifest.xml'. See the below source
code:
> 
> ${ANDROID_SRC}/sdk/anttasks/src/com/android/ant/ManifestMergerTask.java
> 118             // no merge (disabled or nothing to merge)? do a simple copy.
> 119             try {
> 120                 new FileOp().copyFile(appManifestFile, new
> File(mOutManifest));
> 121             } catch (IOException e) {
> 122                 throw new BuildException(e);
> 123             }
> 
> for backward compatibility(r19 needs AndroidManifest.xml under the project
base
> dir),  copy the input manifest file to a new file. 
> 
> Please review it. Thanks.
Another solution is split the directory for project base and output.  Compared
to this, current patch is simpler. If you think it's better, i'll provide a new
patch.

[nilesh, 2012-07-11 05:58:31]

http://codereview.chromium.org/10694128/diff/1/testing/android/native_test_ap...
File testing/android/native_test_apk.xml (right):

http://codereview.chromium.org/10694128/diff/1/testing/android/native_test_ap...
testing/android/native_test_apk.xml:69: <copy
file="${out.dir}/AndroidManifest.xml" todir="${out.dir}/manifest"/>
Please add a comment here.

[yongsheng, 2012-07-11 06:02:23]

On 2012/07/11 05:58:31, nileshagrawal1 wrote:
>
http://codereview.chromium.org/10694128/diff/1/testing/android/native_test_ap...
> File testing/android/native_test_apk.xml (right):
> 
>
http://codereview.chromium.org/10694128/diff/1/testing/android/native_test_ap...
> testing/android/native_test_apk.xml:69: <copy
> file="${out.dir}/AndroidManifest.xml" todir="${out.dir}/manifest"/>
> Please add a comment here.
ok, I'll.

[nilesh, 2012-07-11 17:12:13]

On 2012/07/11 06:02:23, yongsheng.zhu wrote:
> On 2012/07/11 05:58:31, nileshagrawal1 wrote:
> >
>
http://codereview.chromium.org/10694128/diff/1/testing/android/native_test_ap...
> > File testing/android/native_test_apk.xml (right):
> > 
> >
>
http://codereview.chromium.org/10694128/diff/1/testing/android/native_test_ap...
> > testing/android/native_test_apk.xml:69: <copy
> > file="${out.dir}/AndroidManifest.xml" todir="${out.dir}/manifest"/>
> > Please add a comment here.
> ok, I'll.

LG

[John Grabowski, 2012-07-11 20:36:25]

Owners LGTM

[commit-bot: I haz the power, 2012-07-12 01:20:23]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/yongsheng.zhu@intel.com/10694128/1002

[yongsheng, 2012-07-12 01:20:34]

On 2012/07/11 20:36:25, John Grabowski wrote:
> Owners LGTM
thanks, john and nileshagrawal.

[commit-bot: I haz the power, 2012-07-12 01:32:35]

Try job failure for 10694128-1002 (retry) on android for steps "compile, build"
(clobber build).
It's a second try, previously, steps "compile, build" failed.
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=android&nu...

[yongsheng, 2012-07-12 01:34:28]

On 2012/07/12 01:32:35, I haz the power (commit-bot) wrote:
> Try job failure for 10694128-1002 (retry) on android for steps "compile,
build"
> (clobber build).
> It's a second try, previously, steps "compile, build" failed.
>
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=android&nu...
I'll have a check.

[yongsheng, 2012-07-12 03:10:54]

Fix the stupid error. Please check it again.

[commit-bot: I haz the power, 2012-07-12 06:05:18]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/yongsheng.zhu@intel.com/10694128/10003

[yongsheng, 2012-07-12 06:11:42]

On 2012/07/12 06:05:18, I haz the power (commit-bot) wrote:
> CQ is trying da patch. Follow status at
>
https://chromium-status.appspot.com/cq/yongsheng.zhu%40intel.com/10694128/10003
clean my environment and test with my sdk r19 and r20. It's ok.
Let's see trybot results.

[commit-bot: I haz the power, 2012-07-12 07:16:10]

Change committed as 146296