android: Remove unused codegen_input_paths and library_manifest_paths.

build/android/ant/apk-codegen.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!--
     Copyright (C) 2005-2008 The Android Open Source Project
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
 
          http://www.apache.org/licenses/LICENSE-2.0
 
@@ skipping 43 matching lines @@
 
   <loadresource property="project.library.packages">
     <propertyresource name="ADDITIONAL_RES_PACKAGES"/>
     <filterchain>
       <replacestring from=" " to=";"/>
     </filterchain>
   </loadresource>
   <!-- Set to empty if not set by the loadresource above -->
   <property name="project.library.packages" value=""/>
 
-  <path id="project.library.manifest.file.path">
-    <filelist files="${LIBRARY_MANIFEST_PATHS}"/>
-  </path>
-
-  <!-- manifest merger default value -->
-  <condition property="manifestmerger.enabled"
-      value="false"
-      else="true">
-    <equals arg1="${LIBRARY_MANIFEST_PATHS}" arg2="" />
-  </condition>
-
   <property name="resource.absolute.dir" value="${RESOURCE_DIR}"/>
 
   <property name="manifest.file" value="${ANDROID_MANIFEST}" />
   <property name="manifest.abs.file" location="${manifest.file}" />
 
   <!-- Intermediate files -->
   <property name="resource.package.file.name" value="${APK_NAME}.ap_" />
 
   <property name="aapt.ignore.assets" value="" />
 
-  <target name="-mergemanifest">
-      <mergemanifest
-              appManifest="${manifest.abs.file}"
-              outManifest="${out.manifest.abs.file}"
-              enabled="${manifestmerger.enabled}">
-        <library refid="project.library.manifest.file.path" />
-      </mergemanifest>
-  </target>
-
   <!-- Code Generation: compile resources (aapt -> R.java), aidl -->
-  <target name="-code-gen" depends="-mergemanifest">
+  <target name="-code-gen">
       <mkdir dir="${out.absolute.dir}" />
       <mkdir dir="${out.res.absolute.dir}" />
       <mkdir dir="${gen.absolute.dir}" />
 
       <aapt executable="${aapt}"
               command="package"
               verbose="${verbose}"
               manifest="${out.manifest.abs.file}"

[cjhopman, 2014/03/10 20:04:57]

This should be: manifest="${manifest.abs.file}"

[Nico, 2014/03/10 20:10:24]

https://codereview.chromium.org/193163004/ , thanks.

(I wonder why the try bot was happy, apk-codegen.xml is listed as input…oh, the
generated AndroidManifest.xml was still in the out directory without a clobber.)

               androidjar="${project.target.android.jar}"
               rfolder="${gen.absolute.dir}"
               nonConstantId="false"
               libraryResFolderPathRefid="project.library.res.folder.path"
               libraryPackagesRefid="project.library.packages"
               libraryRFileRefid="project.library.bin.r.file.path"
               ignoreAssets="${aapt.ignore.assets}"
               binFolder="${out.absolute.dir}"
               proguardFile="${out.absolute.dir}/proguard.txt">
           <res path="${out.res.absolute.dir}" />
           <res path="${resource.absolute.dir}" />
       </aapt>
 
       <touch file="${STAMP}" />
   </target>
 </project>