Remove ant stuff dealing with library dependencies

build/android/ant/apk-build.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
 
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
 
 <project name="android_rules" default="debug">
 
-    <!--
-        This build file is imported by the project build file. It contains
-        all the targets and tasks necessary to build Android projects, be they
-        regular projects, library projects, or test projects.
-
-        At the beginning of the file is a list of properties that can be overridden
-        by adding them to your ant.properties (properties are immutable, so their
-        first definition sticks and is never changed).
-
-        Follows:
-        - custom task definitions,
-        - more properties (do not override those unless the whole build system is modified).
-        - macros used throughout the build,
-        - base build targets,
-        - debug-specific build targets,
-        - release-specific build targets,
-        - instrument-specific build targets,
-        - test project-specific build targets,
-        - install targets,
-        - help target
-    -->
-
     <property-location name="out.dir" location="${OUT_DIR}" check-exists="false" />
 
     <path id="javac.srcdirs.additional">
       <filelist files="${ADDITIONAL_SRC_DIRS}"/>
       <filelist files="${GENERATED_SRC_DIRS}"/>
     </path>
 
     <!--
       Include additional resource folders in the apk, e.g. content/.../res.  We
       list the res folders in project.library.res.folder.path and the
@@ skipping 26 matching lines @@
     <!-- Set the output directory for the final apk to the ${apks.dir}. -->
     <property-location name="out.final.file"
         location="${apks.dir}/${ant.project.name}.apk"
         check-exists="false"/>
 
     <!-- Classpath for javac -->
     <path id="javac.custom.classpath">
       <filelist files="${INPUT_JARS_PATHS}"/>
     </path>
 
+    <!--
+      TODO(cjhopman): This is wrong for proguard builds. In that case, it should be just the
+      obfuscated jar.
+    -->
     <path id="out.dex.jar.input.ref">
       <path refid="javac.custom.classpath"/>
     </path>
 
     <path id="native.libs.gdbserver">
       <fileset file="${android.gdbserver}"/>
     </path>
 
     <!-- Disables automatic signing. -->
     <property name="build.is.signing.debug" value="false"/>
@@ skipping 209 matching lines @@
     <!-- Configurable macro, which allows to pass as parameters output directory,
          output dex filename and external libraries to dex (optional) -->
     <macrodef name="dex-helper">
         <element name="external-libs" optional="yes" />
         <attribute name="nolocals" default="false" />
         <sequential>
             <!-- sets the primary input for dex. If a pre-dex task sets it to
                  something else this has no effect -->
             <property name="out.dex.input.absolute.dir" value="${out.classes.absolute.dir}" />
 
-            <!-- set the secondary dx input: the project (and library) jar files
-                 If a pre-dex task sets it to something else this has no effect -->
-            <if>
-                <condition>
-                    <isreference refid="out.dex.jar.input.ref" />
-                </condition>
-                <else>
-                    <path id="out.dex.jar.input.ref">
-                        <path refid="project.all.jars.path" />
-                    </path>
-                </else>
-            </if>
-
             <dex executable="${dx}"
                     output="${intermediate.dex.file}"
                     dexedlibs="${out.dexed.absolute.dir}"
                     nolocals="@{nolocals}"
                     forceJumbo="${dex.force.jumbo}"
                     verbose="${verbose}">
                 <path path="${out.dex.input.absolute.dir}"/>
                 <path refid="out.dex.jar.input.ref" />
                 <external-libs />
             </dex>
@@ skipping 17 matching lines @@
                     resourcefile="${resource.package.file.name}"
                     apkfilepath="${out.packaged.file}"
                     debugpackaging="${build.is.packaging.debug}"
                     debugsigning="${build.is.signing.debug}"
                     verbose="${verbose}"
                     hascode="${manifest.hasCode}"
                     previousBuildType="${build.last.is.packaging.debug}/${build.last.is.signing.debug}"
                     buildType="${build.is.packaging.debug}/${build.is.signing.debug}">
                 <dex path="${intermediate.dex.file}"/>
                 <sourcefolder path="${source.absolute.dir}"/>
-                <jarfile refid="project.all.jars.path" />
                 <nativefolder path="${native.libs.absolute.dir}" />
-                <nativefolder refid="project.library.native.folder.path" />
                 <extra-jars/>
             </apkbuilder>
         </sequential>
     </macrodef>
 
     <!-- This is macro which zipaligns in.package and outputs it to out.package. Used by targets
          debug and release.-->
     <macrodef name="zipalign-helper">
         <attribute name="in.package" />
         <attribute name="out.package" />
@@ skipping 39 matching lines @@
 
     <!-- ******************************************************* -->
     <!-- ******************** Build Targets ******************** -->
     <!-- ******************************************************* -->
 
     <!-- Basic Ant + SDK check -->
     <target name="-check-env">
         <checkenv />
     </target>
 
-    <!-- target to disable building dependencies -->
-    <target name="nodeps">
-        <property name="dont.do.deps" value="true" />
-    </target>
-
     <!-- generic setup -->
     <target name="-setup" depends="-check-env">
         <echo level="info">Project Name: ${ant.project.name}</echo>
         <gettype projectTypeOut="project.type" />
 
         <!-- sets a few boolean based on project.type
              to make the if task easier -->
         <condition property="project.is.library" value="true" else="false">
             <equals arg1="${project.type}" arg2="library" />
         </condition>
@@ skipping 31 matching lines @@
         <if condition="${project.is.test}">
             <then>
                 <property name="tested.project.absolute.dir" location="${tested.project.dir}" />
                 <subant failonerror="true">
                     <fileset dir="${tested.project.absolute.dir}" includes="build.xml" />
                     <target name="clean" />
                 </subant>
             </then>
         </if>
 
-        <!-- get all the libraries -->
-        <if>
-            <condition><not><isset property="dont.do.deps" /></not></condition>
-            <then>
-                <getlibpath libraryFolderPathOut="project.library.folder.path" />
-                <if>
-                    <condition>
-                        <isreference refid="project.library.folder.path" />
-                    </condition>
-                    <then>
-                        <!-- clean the libraries with nodeps since we already
-                             know about all the libraries even the indirect one -->
-                        <subant
-                                buildpathref="project.library.folder.path"
-                                antfile="build.xml"
-                                failonerror="true">
-                            <target name="nodeps" />
-                            <target name="clean" />
-                        </subant>
-                    </then>
-                </if>
-            </then>
-        </if>
     </target>
 
     <!-- Pre build setup -->
     <target name="-build-setup" depends="-setup">
 
         <!-- read the previous build mode -->
         <property file="${out.build.prop.file}" />
         <!-- if empty the props won't be set, meaning it's a new build.
              To force a build, set the prop to empty values. -->
         <property name="build.last.target" value="" />
@@ skipping 55 matching lines @@
         <echo level="info">Creating output directories if needed...</echo>
         <mkdir dir="${resource.absolute.dir}" />
         <mkdir dir="${jar.libs.absolute.dir}" />
         <mkdir dir="${out.absolute.dir}" />
         <mkdir dir="${out.res.absolute.dir}" />
         <do-only-if-manifest-hasCode>
             <mkdir dir="${gen.absolute.dir}" />
             <mkdir dir="${out.classes.absolute.dir}" />
             <mkdir dir="${out.dexed.absolute.dir}" />
         </do-only-if-manifest-hasCode>
-
-        <echo level="info">----------</echo>
-        <echo level="info">Resolving Dependencies for ${ant.project.name}...</echo>
-        <dependency
-                libraryFolderPathOut="project.library.folder.path"
-                libraryPackagesOut="project.library.packages"
-                libraryManifestFilePathOut="project.library.manifest.file.path"
-                libraryResFolderPathOut="project.library.res.folder.path"
-                libraryBinAidlFolderPathOut="project.library.bin.aidl.folder.path"
-                libraryRFilePathOut="project.library.bin.r.file.path"
-                libraryNativeFolderPathOut="project.library.native.folder.path"
-                jarLibraryPathOut="project.all.jars.path"
-                targetApi="${project.target.apilevel}"
-                verbose="${verbose}" />
-
-        <!-- no tested project, make an empty Path object so that javac doesn't
-             complain -->
-        <path id="tested.project.classpath" />
     </target>
 
     <!-- empty default pre-build target. Create a similar target in
          your build.xml and it'll be called instead of this one. -->
     <target name="-pre-build"/>
 
     <!-- Code Generation: compile resources (aapt -> R.java), aidl -->
     <target name="-code-gen">
         <!-- always merge manifest -->
         <mergemanifest
                 appManifest="${manifest.abs.file}"
                 outManifest="${out.manifest.abs.file}"
                 enabled="${manifestmerger.enabled}">
-            <library refid="project.library.manifest.file.path" />
         </mergemanifest>
 
         <do-only-if-manifest-hasCode
                 elseText="hasCode = false. Skipping aidl/R.java">
             <echo level="info">----------</echo>
             <echo level="info">Handling Resources...</echo>
             <aapt executable="${aapt}"
                     command="package"
                     verbose="${verbose}"
                     manifest="${out.manifest.abs.file}"
@@ skipping 152 matching lines @@
               <regexpmapper from='^([^ ]*)( .*)$$' to='"\1\2"'/>
               <identitymapper/>
             </firstmatchmapper>
           </pathconvert>
 
           <!-- Build a path object with all the jar files that must be obfuscated.
                This include the project compiled source code and any 3rd party jar
                files. -->
           <path id="project.all.classes.path">
             <pathelement location="${preobfuscate.jar.file}"/>
-            <path refid="project.all.jars.path"/>
             <!-- Pass javac.custom.classpath for apks. -->
             <path refid="javac.custom.classpath"/>
           </path>
           <!-- Set the project jar files Path object into a single property. It'll be
                all the jar files separated by a platform path-separator.
                Each path must be quoted if it contains spaces.
           -->
           <pathconvert property="project.all.classes.value" refid="project.all.classes.path">
             <firstmatchmapper>
               <regexpmapper from='^([^ ]*)( .*)$$' to='"\1\2"'/>
@@ skipping 269 matching lines @@
 
     <!-- This runs -package-release and -release-nosign first and then runs
          only if release-sign is true (set in -release-check,
          called by -release-no-sign)-->
     <target name="release"
                 depends="-set-release-mode, -release-obfuscation-check, -package, -post-package, -release-prompt-for-password, -release-nosign, -release-sign, -post-build"
                 description="Builds the application in release mode.">
     </target>
 
 </project>