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

Unified Diff: libadblockplus-android-settings/build.xml

Issue 29361445: Issue 4399 - Add WebView inheritor with ad blocking (Closed)
Patch Set: fixed 2 more members in AdblockEngine Created Dec. 16, 2016, 8:31 a.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..6b0fb0930ed412cdf2d395bed040e75ded40dfa1 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"
-->
+
+ <!--
+ Walkaround for the issue: ant does not copy assets from libraries by default
Felix Dahlke 2016/12/16 13:40:45 Sure you mean a https://en.wikipedia.org/wiki/Walk
anton 2016/12/19 13:22:14 It's `workaround`, i will fix it
+ 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" />

Powered by Google App Engine
This is Rietveld