 Issue 29344967:
  Issue 4031 - Implement tests for libadblockplus-android  (Closed)
    
  
    Issue 29344967:
  Issue 4031 - Implement tests for libadblockplus-android  (Closed) 
  | Left: | ||
| Right: | 
| OLD | NEW | 
|---|---|
| 1 <?xml version="1.0" encoding="UTF-8"?> | 1 <?xml version="1.0" encoding="UTF-8"?> | 
| 2 <project name="Adblock Plus Library" default="help"> | 2 <project name="Adblock Plus Library Tests" default="help"> | 
| 3 | 3 | 
| 4 <!-- The local.properties file is created and updated by the 'android' tool. | 4 <!-- The local.properties file is created and updated by the 'android' tool. | 
| 5 It contains the path to the SDK. It should *NOT* be checked into | 5 It contains the path to the SDK. It should *NOT* be checked into | 
| 6 Version Control Systems. --> | 6 Version Control Systems. --> | 
| 7 <property file="local.properties" /> | 7 <property file="local.properties" /> | 
| 8 | 8 | 
| 9 <!-- The ant.properties file can be created by you. It is only edited by the | 9 <!-- The ant.properties file can be created by you. It is only edited by the | 
| 10 'android' tool to add properties to it. | 10 'android' tool to add properties to it. | 
| 11 This is the place to change some Ant specific build properties. | 11 This is the place to change some Ant specific build properties. | 
| 12 Here are some properties you may want to change/update: | 12 Here are some properties you may want to change/update: | 
| 13 | 13 | 
| 14 source.dir | 14 source.dir | 
| 15 The name of the source directory. Default is 'src'. | 15 The name of the source directory. Default is 'src'. | 
| 16 out.dir | 16 out.dir | 
| 17 The name of the output directory. Default is 'bin'. | 17 The name of the output directory. Default is 'bin'. | 
| 18 | 18 | 
| 19 For other overridable properties, look at the beginning of the rules | 19 For other overridable properties, look at the beginning of the rules | 
| 20 files in the SDK, at tools/ant/build.xml | 20 files in the SDK, at tools/ant/build.xml | 
| 21 | 21 | 
| 22 Properties related to the SDK location or the project target should | 22 Properties related to the SDK location or the project target should | 
| 23 be updated using the 'android' tool with the 'update' action. | 23 be updated using the 'android' tool with the 'update' action. | 
| 24 | 24 | 
| 25 This file is an integral part of the build system for your | 25 This file is an integral part of the build system for your | 
| 26 application and should be checked into Version Control Systems. | 26 application and should be checked into Version Control Systems. | 
| 27 | 27 | 
| 28 --> | 28 --> | 
| 29 <property file="ant.properties" /> | 29 <property file="ant.properties" /> | 
| 30 | 30 | 
| 31 <!-- if sdk.dir was not set from one of the property file, then | |
| 
Felix Dahlke
2016/09/12 13:52:13
Nit: "one of the property files"?
 
Felix Dahlke
2016/09/13 08:30:14
What about this comment?
 
Felix Dahlke
2016/09/13 10:51:44
You don't seem to have noticed this comment, hm?
 
Felix Dahlke
2016/09/15 08:54:38
You still don't seem to have noticed this comment.
 
anton
2016/09/15 10:09:33
Sorry for not replying to this.
There are few "*.
 
Felix Dahlke
2016/09/15 10:31:26
I know, I was just complaining about the grammar:
 | |
| 32 get it from the ANDROID_HOME env var. | |
| 33 This must be done before we load project.properties since | |
| 34 the proguard config can use sdk.dir --> | |
| 35 <property environment="env" /> | |
| 36 <condition property="sdk.dir" value="${env.ANDROID_HOME}"> | |
| 37 <isset property="env.ANDROID_HOME" /> | |
| 38 </condition> | |
| 39 | |
| 31 <!-- The project.properties file is created and updated by the 'android' | 40 <!-- The project.properties file is created and updated by the 'android' | 
| 32 tool, as well as ADT. | 41 tool, as well as ADT. | 
| 33 | 42 | 
| 34 This contains project specific properties such as project target, and l ibrary | 43 This contains project specific properties such as project target, and l ibrary | 
| 35 dependencies. Lower level build properties are stored in ant.properties | 44 dependencies. Lower level build properties are stored in ant.properties | 
| 36 (or in .classpath for Eclipse projects). | 45 (or in .classpath for Eclipse projects). | 
| 37 | 46 | 
| 38 This file is an integral part of the build system for your | 47 This file is an integral part of the build system for your | 
| 39 application and should be checked into Version Control Systems. --> | 48 application and should be checked into Version Control Systems. --> | 
| 40 <loadproperties srcFile="project.properties" /> | 49 <loadproperties srcFile="project.properties" /> | 
| 41 | 50 | 
| 42 <target name="jni" description="Compiles and builds NDK libraries."> | 51 <!-- quick check on sdk.dir --> | 
| 43 <exec executable="${ndk.dir}/ndk-build" failonerror="true" /> | 52 <fail | 
| 44 </target> | 53 message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environm ent variable." | 
| 54 unless="sdk.dir" | |
| 55 /> | |
| 45 | 56 | 
| 46 <target name="-pre-build" depends="jni"> | 57 <!-- | 
| 47 </target> | 58 Import per project custom build rules if present at the root of the proj ect. | 
| 48 | 59 This is the place to put custom intermediary targets such as: | 
| 49 <target name="-pre-clean"> | 60 -pre-build | 
| 50 <delete dir="${native.libs.absolute.dir}/armeabi" verbose="${verbose}" / > | 61 -pre-compile | 
| 51 <delete dir="${native.libs.absolute.dir}/armeabi-v7a" verbose="${verbose }" /> | 62 -post-compile (This is typically used for code obfuscation. | 
| 52 <delete dir="${native.libs.absolute.dir}/x86" verbose="${verbose}" /> | 63 Compiled code location: ${out.classes.absolute.dir} | 
| 53 <delete dir="obj/" verbose="${verbose}" /> | 64 If this is not done in place, override ${out.dex.inpu t.absolute.dir}) | 
| 54 </target> | 65 -post-package | 
| 66 -post-build | |
| 67 -pre-clean | |
| 68 --> | |
| 69 <import file="custom_rules.xml" optional="true" /> | |
| 55 | 70 | 
| 56 <!-- Import the actual build file. | 71 <!-- Import the actual build file. | 
| 57 | 72 | 
| 58 To customize existing targets, there are two options: | 73 To customize existing targets, there are two options: | 
| 59 - Customize only one target: | 74 - Customize only one target: | 
| 60 - copy/paste the target into this file, *before* the | 75 - copy/paste the target into this file, *before* the | 
| 61 <import> task. | 76 <import> task. | 
| 62 - customize it to your needs. | 77 - customize it to your needs. | 
| 63 - Customize the whole content of build.xml | 78 - Customize the whole content of build.xml | 
| 64 - copy/paste the content of the rules files (minus the top node) | 79 - copy/paste the content of the rules files (minus the top node) | 
| 65 into this file, replacing the <import> task. | 80 into this file, replacing the <import> task. | 
| 66 - customize to your needs. | 81 - customize to your needs. | 
| 67 | 82 | 
| 68 *********************** | 83 *********************** | 
| 69 ****** IMPORTANT ****** | 84 ****** IMPORTANT ****** | 
| 70 *********************** | 85 *********************** | 
| 71 In all cases you must update the value of version-tag below to read 'cu stom' instead of an integer, | 86 In all cases you must update the value of version-tag below to read 'cu stom' instead of an integer, | 
| 72 in order to avoid having your file be overridden by tools such as "andr oid update project" | 87 in order to avoid having your file be overridden by tools such as "andr oid update project" | 
| 73 --> | 88 --> | 
| 74 <!-- version-tag: custom --> | 89 <!-- version-tag: 1 --> | 
| 75 <import file="${sdk.dir}/tools/ant/build.xml" /> | 90 <import file="${sdk.dir}/tools/ant/build.xml" /> | 
| 76 | 91 | 
| 77 </project> | 92 </project> | 
| OLD | NEW |