Unified Diff: libadblockplus-android-webview/build.xml
Issue 29351744:
Issue 4399 - Add WebView inheritor with ad blocking (Closed)
Patch Set: fixed: hardcoded js bridge name
Created Oct. 21, 2016, 10:33 a.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« libadblockplus-android-webview/build.gradle ('k')
|
libadblockplus-android-webview/pom.xml » ('j')
|
no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: libadblockplus-android-webview/build.xml |
| diff --git a/libadblockplus-android/build.xml b/libadblockplus-android-webview/build.xml |
| similarity index 81% |
| copy from libadblockplus-android/build.xml |
| copy to libadblockplus-android-webview/build.xml |
| index c41390f90787663c05fb2519b73246b3b625ad60..59df32770230e4d1c979c26ca965a216af92190c 100644 |
| --- a/libadblockplus-android/build.xml |
| +++ b/libadblockplus-android-webview/build.xml |
| @@ -1,5 +1,5 @@ |
| <?xml version="1.0" encoding="UTF-8"?> |
| -<project name="Adblock Plus Library" default="help"> |
| +<project name="Adblock Plus WebView 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 |
| + 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" /> |
« no previous file with comments
|
« libadblockplus-android-webview/build.gradle ('k')
|
libadblockplus-android-webview/pom.xml » ('j')
|
no next file with comments »
