Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Unified Diff: libadblockplus-android-tests/build.xml

Issue 29344967: Issue 4031 - Implement tests for libadblockplus-android (Closed)
Patch Set: fix typo ".. file[s]" Created Sept. 15, 2016, 10:44 a.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: libadblockplus-android-tests/build.xml
diff --git a/libadblockplus-android/build.xml b/libadblockplus-android-tests/build.xml
similarity index 66%
copy from libadblockplus-android/build.xml
copy to libadblockplus-android-tests/build.xml
index c41390f90787663c05fb2519b73246b3b625ad60..16cbcabfd5dacf03f232858a13ab157318115d7b 100644
--- a/libadblockplus-android/build.xml
+++ b/libadblockplus-android-tests/build.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project name="Adblock Plus Library" default="help">
+<project name="Adblock Plus Library Tests" 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
@@ -28,6 +28,15 @@
-->
<property file="ant.properties" />
+ <!-- if sdk.dir was not set from one of the property files, then
+ get it from the ANDROID_HOME env var.
+ This must be done before we load project.properties since
+ the proguard config can use sdk.dir -->
+ <property environment="env" />
+ <condition property="sdk.dir" value="${env.ANDROID_HOME}">
+ <isset property="env.ANDROID_HOME" />
+ </condition>
+
<!-- The project.properties file is created and updated by the 'android'
tool, as well as ADT.
@@ -39,19 +48,25 @@
application and should be checked into Version Control Systems. -->
<loadproperties srcFile="project.properties" />
- <target name="jni" description="Compiles and builds NDK libraries.">
- <exec executable="${ndk.dir}/ndk-build" failonerror="true" />
- </target>
-
- <target name="-pre-build" depends="jni">
- </target>
-
- <target name="-pre-clean">
- <delete dir="${native.libs.absolute.dir}/armeabi" verbose="${verbose}" />
- <delete dir="${native.libs.absolute.dir}/armeabi-v7a" verbose="${verbose}" />
- <delete dir="${native.libs.absolute.dir}/x86" verbose="${verbose}" />
- <delete dir="obj/" verbose="${verbose}" />
- </target>
+ <!-- quick check on sdk.dir -->
+ <fail
+ message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
+ unless="sdk.dir"
+ />
+
+ <!--
+ Import per project custom build rules if present at the root of the project.
+ This is the place to put custom intermediary targets such as:
+ -pre-build
+ -pre-compile
+ -post-compile (This is typically used for code obfuscation.
+ Compiled code location: ${out.classes.absolute.dir}
+ If this is not done in place, override ${out.dex.input.absolute.dir})
+ -post-package
+ -post-build
+ -pre-clean
+ -->
+ <import file="custom_rules.xml" optional="true" />
<!-- Import the actual build file.
@@ -71,7 +86,7 @@
In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
in order to avoid having your file be overridden by tools such as "android update project"
-->
- <!-- version-tag: custom -->
+ <!-- version-tag: 1 -->
<import file="${sdk.dir}/tools/ant/build.xml" />
</project>
« no previous file with comments | « libadblockplus-android-tests/ant.properties ('k') | libadblockplus-android-tests/libs/android-testing-support.jar » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld