| Index: build.xml |
| =================================================================== |
| --- a/build.xml |
| +++ b/build.xml |
| @@ -1,10 +1,10 @@ |
| <?xml version="1.0" encoding="UTF-8"?> |
| -<project name="Adblock Plus" default="help"> |
| +<project name="Adblock Plus App" default="help"> |
| <!-- The local.properties file is created and updated by the 'android' tool. |
| It contains the path to the SDK. It should *NOT* be checked into |
| Version Control Systems. --> |
| <property file="local.properties" /> |
| <!-- The ant.properties file can be created by you. It is only edited by the |
| 'android' tool to add properties to it. |
| @@ -38,40 +38,31 @@ |
| This file is an integral part of the build system for your |
| application and should be checked into Version Control Systems. --> |
| <loadproperties srcFile="project.properties" /> |
| <fail |
| message="sdk.dir is missing. Make sure to generate specify it in local.properties or to inject it through an env var" |
| unless="sdk.dir" |
| /> |
| - <fail |
| - message="ndk.dir is missing. Make sure to generate specify it in local.properties or to inject it through an env var" |
| - unless="ndk.dir" |
| - /> |
| <target name="-check-env"> |
| <checkenv /> |
| <exec executable="${sdk.dir}/tools/android" failonerror="true"> |
| <arg line="update lib-project --target android-14 --path submodules/actionbarsherlock/library"/> |
| </exec> |
| <exec executable="${sdk.dir}/tools/android" failonerror="true"> |
| <arg line="update lib-project --target android-7 --path submodules/android-switch-backport"/> |
| </exec> |
| - </target> |
| - |
| - <target name="jni" description="Compiles and builds NDK libraries."> |
| - <exec executable="${ndk.dir}/ndk-build" failonerror="true" /> |
| - </target> |
| - |
| - <target name="-pre-build" depends="jni"> |
| + <exec executable="${sdk.dir}/tools/android" failonerror="true"> |
| + <arg line="update lib-project --target android-14 --path submodules/libadblockplus-android/libadblockplus-android"/> |
| + </exec> |
| </target> |
| <target name="-pre-clean"> |
| - <delete dir="${native.libs.absolute.dir}/armeabi" verbose="${verbose}" /> |
| <delete dir="obj/" verbose="${verbose}" /> |
| </target> |
| <!-- Import the actual build file. |
| To customize existing targets, there are two options: |
| - Customize only one target: |
| - copy/paste the target into this file, *before* the |