libadblockplus-android-tests/build.xml - Issue 29344967: Issue 4031 - Implement tests for libadblockplus-android

Delta Between Two Patch Sets: libadblockplus-android-tests/build.xml

Issue 29344967: Issue 4031 - Implement tests for libadblockplus-android (Closed)

Left Patch Set: With fixed version Created Sept. 8, 2016, 1:53 p.m.

Right Patch Set: fix typo ".. file[s]" Created Sept. 15, 2016, 10:44 a.m.

Left:
Right:

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

Left: Side by side diff | Download
Right: Side by side diff | Download

LEFT	RIGHT
1 <?xml version="1.0" encoding="UTF-8"?>	1 <?xml version="1.0" encoding="UTF-8"?>

2 <project name="Adblock Plus Library Tests" 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.

(...skipping 10 matching lines...) Expand all Loading...
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	31 <!-- if sdk.dir was not set from one of the property files, then
Felix Dahlke 2016/09/12 13:52:13 Nit: "one of the property files"? Nit: "one of the property files"? Felix Dahlke 2016/09/13 08:30:14 What about this comment? Show quoted text On 2016/09/12 13:52:13, Felix Dahlke wrote: > Nit: "one of the property files"? What about this comment? Felix Dahlke 2016/09/13 10:51:44 You don't seem to have noticed this comment, hm? Show quoted text On 2016/09/13 08:30:14, Felix Dahlke wrote: > On 2016/09/12 13:52:13, Felix Dahlke wrote: > > Nit: "one of the property files"? > > What about this comment? 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. Show quoted text On 2016/09/13 10:51:44, Felix Dahlke wrote: > On 2016/09/13 08:30:14, Felix Dahlke wrote: > > On 2016/09/12 13:52:13, Felix Dahlke wrote: > > > Nit: "one of the property files"? > > > > What about this comment? > > You don't seem to have noticed this comment, hm? You still don't seem to have noticed this comment. Can you make sure to address all comments one way or another? If you tackled them you can just hit "Done", then the reviewer knows you've changed something. If you don't agree with a comment, please respond. anton 2016/09/15 10:09:33 Sorry for not replying to this. There are few ". Show quoted text On 2016/09/15 08:54:38, Felix Dahlke wrote: > On 2016/09/13 10:51:44, Felix Dahlke wrote: > > On 2016/09/13 08:30:14, Felix Dahlke wrote: > > > On 2016/09/12 13:52:13, Felix Dahlke wrote: > > > > Nit: "one of the property files"? > > > > > > What about this comment? > > > > You don't seem to have noticed this comment, hm? > > You still don't seem to have noticed this comment. > > Can you make sure to address all comments one way or another? If you tackled > them you can just hit "Done", then the reviewer knows you've changed something. > If you don't agree with a comment, please respond. Sorry for not replying to this. There are few ".properties" files where local variable can be set: ant.properties and local.properties (see above). sdk.dir can be declared in any of them, usually in local.properties. Everything looks good for me here. Felix Dahlke 2016/09/15 10:31:26 I know, I was just complaining about the grammar: Show quoted text On 2016/09/15 10:09:33, anton wrote: > On 2016/09/15 08:54:38, Felix Dahlke wrote: > > On 2016/09/13 10:51:44, Felix Dahlke wrote: > > > On 2016/09/13 08:30:14, Felix Dahlke wrote: > > > > On 2016/09/12 13:52:13, Felix Dahlke wrote: > > > > > Nit: "one of the property files"? > > > > > > > > What about this comment? > > > > > > You don't seem to have noticed this comment, hm? > > > > You still don't seem to have noticed this comment. > > > > Can you make sure to address all comments one way or another? If you tackled > > them you can just hit "Done", then the reviewer knows you've changed > something. > > If you don't agree with a comment, please respond. > > Sorry for not replying to this. > > There are few "*.properties" files where local variable can be set: > ant.properties and local.properties (see above). > sdk.dir can be declared in any of them, usually in local.properties. Everything > looks good for me here. I know, I was just complaining about the grammar: "one of the property file" -> "one of the property files".
32 get it from the ANDROID_HOME env var.	32 get it from the ANDROID_HOME env var.

33 This must be done before we load project.properties since	33 This must be done before we load project.properties since

34 the proguard config can use sdk.dir -->	34 the proguard config can use sdk.dir -->

35 <property environment="env" />	35 <property environment="env" />

36 <condition property="sdk.dir" value="${env.ANDROID_HOME}">	36 <condition property="sdk.dir" value="${env.ANDROID_HOME}">

37 <isset property="env.ANDROID_HOME" />	37 <isset property="env.ANDROID_HOME" />

38 </condition>	38 </condition>

39	39

40 <!-- The project.properties file is created and updated by the 'android'	40 <!-- The project.properties file is created and updated by the 'android'

41 tool, as well as ADT.	41 tool, as well as ADT.

(...skipping 41 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
83 ***********************	83 ***********************

84 **** IMPORTANT ****	84 **** IMPORTANT ****

85 ***********************	85 ***********************

86 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,

87 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"

88 -->	88 -->

89 <!-- version-tag: 1 -->	89 <!-- version-tag: 1 -->

90 <import file="${sdk.dir}/tools/ant/build.xml" />	90 <import file="${sdk.dir}/tools/ant/build.xml" />

91	91

92 </project>	92 </project>

LEFT	RIGHT