From 58996122f08e07c6590c5929fba00b73285aa399 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Mon, 31 Mar 2014 20:17:38 +0200 Subject: [PATCH] Revert "Patching 'android.library=true' in is no longer necessary" This reverts commit 7803674329c8cbfb6363064d349d12098d8c3c14. --- srclibs/AndroidStaggeredGrid.txt | 2 +- srclibs/Changelog-cketti.txt | 2 +- srclibs/MenuComponent.txt | 3 ++- srclibs/MobAdMob.txt | 2 +- srclibs/NoAnalytics.txt | 2 +- srclibs/RootTools.txt | 2 +- srclibs/SmoothProgressBar.txt | 2 +- srclibs/ViewPagerTabs.txt | 3 +++ 8 files changed, 11 insertions(+), 7 deletions(-) diff --git a/srclibs/AndroidStaggeredGrid.txt b/srclibs/AndroidStaggeredGrid.txt index 2bd0606351..72ba3e7895 100644 --- a/srclibs/AndroidStaggeredGrid.txt +++ b/srclibs/AndroidStaggeredGrid.txt @@ -2,5 +2,5 @@ Repo Type:git Repo:https://github.com/etsy/AndroidStaggeredGrid Subdir:library/src/main -Prepare:echo 'source.dir=java' > ant.properties +Prepare:echo 'source.dir=java' > ant.properties && echo 'android.library=true' >> project.properties diff --git a/srclibs/Changelog-cketti.txt b/srclibs/Changelog-cketti.txt index 90b1a2ae01..5a1df616e5 100644 --- a/srclibs/Changelog-cketti.txt +++ b/srclibs/Changelog-cketti.txt @@ -2,4 +2,4 @@ Repo Type:git Repo:https://github.com/cketti/ckChangeLog Subdir:library,ckChangeLog/src/main -Prepare:[ -f project.properties ] || echo 'source.dir=java' > ant.properties && echo -e 'target=android-19\nandroid.library=true' > project.properties +Prepare:[ -f project.properties ] || echo 'source.dir=java' > ant.properties && echo -e 'android.library=true\ntarget=android-19' > project.properties diff --git a/srclibs/MenuComponent.txt b/srclibs/MenuComponent.txt index 711ccb5b80..e4c208bab6 100644 --- a/srclibs/MenuComponent.txt +++ b/srclibs/MenuComponent.txt @@ -2,5 +2,6 @@ Repo Type:git Repo:https://github.com/mariotaku/Android-MenuComponent.git Subdir:library -Prepare:mkdir -p libs && echo 'target=android-19' >> project.properties +Prepare:mkdir -p libs && echo -e 'android.library=true\ntarget=android-19' >> project.properties + diff --git a/srclibs/MobAdMob.txt b/srclibs/MobAdMob.txt index 8a74be5eac..ca1f41bb5d 100644 --- a/srclibs/MobAdMob.txt +++ b/srclibs/MobAdMob.txt @@ -3,5 +3,5 @@ Repo:https://github.com/mar-v-in/MobAdMob.git Subdir:MobAdMob -Prepare:echo "target=android-16" >> project.properties +Prepare:echo -e "android.library=true\ntarget=android-16\n" >> project.properties diff --git a/srclibs/NoAnalytics.txt b/srclibs/NoAnalytics.txt index ea6b693a40..be737bde83 100644 --- a/srclibs/NoAnalytics.txt +++ b/srclibs/NoAnalytics.txt @@ -3,6 +3,6 @@ Repo:https://github.com/mar-v-in/NoAnalytics.git Subdir:NoAnalytics -Prepare:[ -f project.properties ] || echo "target=android-16" >> project.properties +Prepare:[ -f project.properties ] || echo -e "android.library=true\ntarget=android-16\n" >> project.properties diff --git a/srclibs/RootTools.txt b/srclibs/RootTools.txt index 70d3dc8450..289ec2e5e8 100644 --- a/srclibs/RootTools.txt +++ b/srclibs/RootTools.txt @@ -1,5 +1,5 @@ Repo Type:git-svn Repo:https://roottools.googlecode.com/svn;trunk=trunk/Stable/RootTools-sdk3-generic;tags=trunk/Stable/TAGS -Prepare:echo "target=android-16" >> project.properties && sed -i 's/debuggable="true"/debuggable="false"/g' AndroidManifest.xml +Prepare:echo -e "android.library=true\ntarget=android-16\n" >> project.properties && sed -i 's/debuggable="true"/debuggable="false"/g' AndroidManifest.xml diff --git a/srclibs/SmoothProgressBar.txt b/srclibs/SmoothProgressBar.txt index c222b7cba5..f4a20c5580 100644 --- a/srclibs/SmoothProgressBar.txt +++ b/srclibs/SmoothProgressBar.txt @@ -2,5 +2,5 @@ Repo Type:git Repo:https://github.com/castorflex/SmoothProgressBar.git Subdir:library/src/main -Prepare:[ -f project.properties ] || echo 'source.dir=java' > ant.properties && echo -e 'target=android-19' > project.properties +Prepare:[ -f project.properties ] || echo 'source.dir=java' > ant.properties && echo -e 'android.library=true\ntarget=android-19' > project.properties diff --git a/srclibs/ViewPagerTabs.txt b/srclibs/ViewPagerTabs.txt index 22495141e2..d0f2ae730f 100644 --- a/srclibs/ViewPagerTabs.txt +++ b/srclibs/ViewPagerTabs.txt @@ -1,3 +1,6 @@ Repo Type:git Repo:https://github.com/astuetz/android-viewpagertabs.git +Prepare:echo -e "android.library=true\ntarget=android-15\n" >> project.properties + +