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

Side by Side Diff: build.xml

Issue 29345540: Issue 4030 - Move JNI bindings into separate library project (Closed)
Patch Set: Changeset in adblockplusandroid repo Created July 22, 2016, 12:10 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
OLDNEW
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <project name="Adblock Plus" default="help"> 2 <project name="Adblock Plus App" 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:
(...skipping 23 matching lines...) Expand all
36 (or in .classpath for Eclipse projects). 36 (or in .classpath for Eclipse projects).
37 37
38 This file is an integral part of the build system for your 38 This file is an integral part of the build system for your
39 application and should be checked into Version Control Systems. --> 39 application and should be checked into Version Control Systems. -->
40 <loadproperties srcFile="project.properties" /> 40 <loadproperties srcFile="project.properties" />
41 41
42 <fail 42 <fail
43 message="sdk.dir is missing. Make sure to generate specify it in local.p roperties or to inject it through an env var" 43 message="sdk.dir is missing. Make sure to generate specify it in local.p roperties or to inject it through an env var"
44 unless="sdk.dir" 44 unless="sdk.dir"
45 /> 45 />
46 <fail
47 message="ndk.dir is missing. Make sure to generate specify it in local.p roperties or to inject it through an env var"
48 unless="ndk.dir"
49 />
50 46
51 <target name="-check-env"> 47 <target name="-check-env">
52 <checkenv /> 48 <checkenv />
53 <exec executable="${sdk.dir}/tools/android" failonerror="true"> 49 <exec executable="${sdk.dir}/tools/android" failonerror="true">
54 <arg line="update lib-project --target android-14 --path submodules/ actionbarsherlock/library"/> 50 <arg line="update lib-project --target android-14 --path submodules/ actionbarsherlock/library"/>
55 </exec> 51 </exec>
56 <exec executable="${sdk.dir}/tools/android" failonerror="true"> 52 <exec executable="${sdk.dir}/tools/android" failonerror="true">
57 <arg line="update lib-project --target android-7 --path submodules/a ndroid-switch-backport"/> 53 <arg line="update lib-project --target android-7 --path submodules/a ndroid-switch-backport"/>
58 </exec> 54 </exec>
59 </target> 55 <exec executable="${sdk.dir}/tools/android" failonerror="true">
60 56 <arg line="update lib-project --target android-14 --path submodules/ libadblockplus-android/libadblockplus-android"/>
61 <target name="jni" description="Compiles and builds NDK libraries."> 57 </exec>
62 <exec executable="${ndk.dir}/ndk-build" failonerror="true" />
63 </target>
64
65 <target name="-pre-build" depends="jni">
66 </target> 58 </target>
67 59
68 <target name="-pre-clean"> 60 <target name="-pre-clean">
69 <delete dir="${native.libs.absolute.dir}/armeabi" verbose="${verbose}" / >
70 <delete dir="obj/" verbose="${verbose}" /> 61 <delete dir="obj/" verbose="${verbose}" />
71 </target> 62 </target>
72 63
73 <!-- Import the actual build file. 64 <!-- Import the actual build file.
74 65
75 To customize existing targets, there are two options: 66 To customize existing targets, there are two options:
76 - Customize only one target: 67 - Customize only one target:
77 - copy/paste the target into this file, *before* the 68 - copy/paste the target into this file, *before* the
78 <import> task. 69 <import> task.
79 - customize it to your needs. 70 - customize it to your needs.
80 - Customize the whole content of build.xml 71 - Customize the whole content of build.xml
81 - copy/paste the content of the rules files (minus the top node) 72 - copy/paste the content of the rules files (minus the top node)
82 into this file, replacing the <import> task. 73 into this file, replacing the <import> task.
83 - customize to your needs. 74 - customize to your needs.
84 75
85 *********************** 76 ***********************
86 ****** IMPORTANT ****** 77 ****** IMPORTANT ******
87 *********************** 78 ***********************
88 In all cases you must update the value of version-tag below to read 'cu stom' instead of an integer, 79 In all cases you must update the value of version-tag below to read 'cu stom' instead of an integer,
89 in order to avoid having your file be overridden by tools such as "andr oid update project" 80 in order to avoid having your file be overridden by tools such as "andr oid update project"
90 --> 81 -->
91 <!-- version-tag: custom --> 82 <!-- version-tag: custom -->
92 <import file="${sdk.dir}/tools/ant/build.xml" /> 83 <import file="${sdk.dir}/tools/ant/build.xml" />
93 84
94 </project> 85 </project>
OLDNEW

Powered by Google App Engine
This is Rietveld