Index: libadblockplus-android-settings/build.xml |
diff --git a/libadblockplus-android/build.xml b/libadblockplus-android-settings/build.xml |
similarity index 81% |
copy from libadblockplus-android/build.xml |
copy to libadblockplus-android-settings/build.xml |
index c41390f90787663c05fb2519b73246b3b625ad60..b410a7708ea8cb70daa549e791d33809f06a6c9b 100644 |
--- a/libadblockplus-android/build.xml |
+++ b/libadblockplus-android-settings/build.xml |
@@ -1,5 +1,5 @@ |
<?xml version="1.0" encoding="UTF-8"?> |
-<project name="Adblock Plus Library" default="help"> |
+<project name="Adblock Plus Settings Library" 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 |
@@ -39,13 +39,6 @@ |
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}" /> |
@@ -71,6 +64,21 @@ |
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" |
--> |
+ |
+ <!-- |
+ Workaround for the issue: ant does not copy assets from libraries by default |
+ http://stackoverflow.com/questions/5889833/android-library-assets-folder-doesnt-get-copied |
+ --> |
+ <target name="-post-compile" if="${project.is.library}"> |
+ <echo>Post Compile: add assets from ${asset.absolute.dir} to ${out.library.jar.file}</echo> |
+ <jar destfile="${out.library.jar.file}" update="true"> |
+ <zipfileset |
+ dir="${asset.absolute.dir}" |
+ prefix="assets" |
+ excludes="**/*.java ${android.package.excludes}"/> |
+ </jar> |
+ </target> |
+ |
<!-- version-tag: custom --> |
<import file="${sdk.dir}/tools/ant/build.xml" /> |