missytake/fdroiddata
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Adaway: more WIP -- wait until gradle builds are solid ...

Browse source 
Jars are now built from source with ant (as recommended in the
Root Commands Readme); the alternative way would
have been to create build.gradles for them and edit build.gradle (and
possibly settings.gradle) to include them as dependencies but this isn't
too easy with our setup. Using local
aars (compiled android libraries) is apparently not recommended but
perhaps would be ok for a final build. The htmlcleaner jar doesn't
appear to be same as the canonical version so we pull that as an extlib
as in previous builds.
This commit is contained in:
David Black 2013-08-26 14:19:31 +01:00
parent 5c83a9578e
commit c161b03957
1 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
metadata/org.adaway.txt
View file

@ -60,6 +60,7 @@ echo "android.library.reference.4=android-libs/HtmlSpanner/htmlspanner" >> proje
find . -type f -print0 | xargs -0 sed -i 's/org.rootcommands/org.sufficientlysecure.rootcommands/g' && \ find . -type f -print0 | xargs -0 sed -i 's/org.rootcommands/org.sufficientlysecure.rootcommands/g' && \
cp android-libs/Donations/ant-templates/other/DonationsConfig.java \ cp android-libs/Donations/ant-templates/other/DonationsConfig.java \
android-libs/Donations/src/org/donations/,buildjni=yes android-libs/Donations/src/org/donations/,buildjni=yes
#RootCommands srclib needs changing on fdroidserver #RootCommands srclib needs changing on fdroidserver
Build Version:2.3,42,v2.3,subdir=AdAway,srclibs=RootCommands@c940b0e503,\ Build Version:2.3,42,v2.3,subdir=AdAway,srclibs=RootCommands@c940b0e503,\
extlibs=htmlcleaner/htmlcleaner-2.2.jar,init=rm android-libs/Donations/custom_rules.xml && \ extlibs=htmlcleaner/htmlcleaner-2.2.jar,init=rm android-libs/Donations/custom_rules.xml && \
@ -74,8 +75,22 @@ find . -type f -print0 | xargs -0 sed -i 's/org.rootcommands/org.sufficientlysec
cp android-libs/Donations/ant-templates/other/DonationsConfig.java \ cp android-libs/Donations/ant-templates/other/DonationsConfig.java \
android-libs/Donations/src/org/donations/,buildjni=yes android-libs/Donations/src/org/donations/,buildjni=yes
Build Version:2.5,44,!WIP at v2.5,subdir=AdAway,buildjni=yes,gradle=yes@..,preassemble=renameExecutables,\ Build Version:2.5,44,!WIP at v2.5,subdir=AdAway,\
patch=no-signing-44.patch init=rm libs/*,\
patch=no-signing-44.patch,\
extlibs=htmlcleaner/htmlcleaner-2.2.jar,\
srclibs=RootCommands@a89cc259;HtmlSpanner-dscuermann@f6907a1c46,\
prebuild=sed -i 's/armeabi x86 mips/armeabi x86 mips/g' jni/Application.mk && \
cp -r $$RootCommands$$ ../libraries/ && \
cp -r $$HtmlSpanner-dscuermann$$ ../libraries/ && \
cp libs/htmlcleaner-2.2.jar ../libraries/htmlspanner/libs/,\
build=ant clean release -f ../libraries/RootCommands-Library/build.xml && \
mv ../libraries/RootCommands-Library/bin/classes.jar libs/root-commands-master.jar && \
ant clean release -f ../libraries/htmlspanner/build.xml && \
mv ../libraries/htmlspanner/bin/classes.jar libs/htmlspanner-0.2-fork.jar,\
buildjni=yes,\
preassemble=renameExecutables,\
gradle=yes@..
Auto Update Mode:None Auto Update Mode:None
Update Check Mode:Tags Update Check Mode:Tags