Delta Between Two Patch Sets: libadblockplus-android/build.xml
Issue 29345540:
Issue 4030 - Move JNI bindings into separate library project (Closed)
Left Patch Set:
Created June 3, 2016, 1:42 p.m.
Right Patch Set: Additional changes to libadblockplus-android with Diego's suggestions
Created Sept. 6, 2016, 6:15 a.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with change/comment
|
« libadblockplus-android/AndroidManifest.xml ('k')
|
no next file »
|
no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| LEFT | RIGHT |
|---|---|
| (no file at all) | |
| 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" 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 | |
| 31 <fail | |
| 32 message="sdk.dir is missing. Make sure to generate specify it in local.p roperties or to inject it through an env var" | |
| 33 unless="sdk.dir" | |
| 34 /> | |
| 35 <fail | |
| 36 message="ndk.dir is missing. Make sure to generate specify it in local.p roperties or to inject it through an env var" | |
| 37 unless="ndk.dir" | |
| 38 /> | |
| 30 | 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. --> |
| (...skipping 28 matching lines...) Expand all Loading... | |
| 68 *********************** | 77 *********************** |
| 69 ****** IMPORTANT ****** | 78 ****** IMPORTANT ****** |
| 70 *********************** | 79 *********************** |
| 71 In all cases you must update the value of version-tag below to read 'cu stom' instead of an integer, | 80 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" | 81 in order to avoid having your file be overridden by tools such as "andr oid update project" |
| 73 --> | 82 --> |
| 74 <!-- version-tag: custom --> | 83 <!-- version-tag: custom --> |
| 75 <import file="${sdk.dir}/tools/ant/build.xml" /> | 84 <import file="${sdk.dir}/tools/ant/build.xml" /> |
| 76 | 85 |
| 77 </project> | 86 </project> |
| LEFT | RIGHT |
« libadblockplus-android/AndroidManifest.xml ('k')
|
no next file »
|
Toggle Intra-line Diffs ('i')
|
Expand Comments ('e')
|
Collapse Comments ('c')
|
Toggle Comments ('s')
