From 7803674329c8cbfb6363064d349d12098d8c3c14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Tue, 11 Feb 2014 17:30:32 +0100 Subject: [PATCH] Patching 'android.library=true' in is no longer necessary Since we now update ant libraries via lib-project --- srclibs/AndroidStaggeredGrid.txt | 2 +- srclibs/Changelog-cketti.txt | 2 +- srclibs/MenuComponent.txt | 3 +-- srclibs/MobAdMob.txt | 3 +-- srclibs/NoAnalytics.txt | 2 +- srclibs/RootTools.txt | 2 +- srclibs/SmoothProgressBar.txt | 2 +- srclibs/ViewPagerTabs.txt | 3 --- srclibs/Volley.txt | 2 +- 9 files changed, 8 insertions(+), 13 deletions(-) diff --git a/srclibs/AndroidStaggeredGrid.txt b/srclibs/AndroidStaggeredGrid.txt index 72ba3e7895..2bd0606351 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 && echo 'android.library=true' >> project.properties +Prepare:echo 'source.dir=java' > ant.properties diff --git a/srclibs/Changelog-cketti.txt b/srclibs/Changelog-cketti.txt index 5a1df616e5..db5f05d0fb 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 'android.library=true\ntarget=android-19' > project.properties +Prepare:[ -f project.properties ] || echo 'source.dir=java' > ant.properties && echo 'target=android-19' > project.properties diff --git a/srclibs/MenuComponent.txt b/srclibs/MenuComponent.txt index e4c208bab6..711ccb5b80 100644 --- a/srclibs/MenuComponent.txt +++ b/srclibs/MenuComponent.txt @@ -2,6 +2,5 @@ Repo Type:git Repo:https://github.com/mariotaku/Android-MenuComponent.git Subdir:library -Prepare:mkdir -p libs && echo -e 'android.library=true\ntarget=android-19' >> project.properties - +Prepare:mkdir -p libs && echo 'target=android-19' >> project.properties diff --git a/srclibs/MobAdMob.txt b/srclibs/MobAdMob.txt index 83eca327cc..cbeb4a5c62 100644 --- a/srclibs/MobAdMob.txt +++ b/srclibs/MobAdMob.txt @@ -3,6 +3,5 @@ Repo:https://github.com/mar-v-in/MobAdMob.git Subdir:MobAdMob -Prepare:echo -e "android.library=true\ntarget=android-16\n" >> project.properties - +Prepare:echo -e "target=android-16\n" >> project.properties diff --git a/srclibs/NoAnalytics.txt b/srclibs/NoAnalytics.txt index be737bde83..ea6b693a40 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 -e "android.library=true\ntarget=android-16\n" >> project.properties +Prepare:[ -f project.properties ] || echo "target=android-16" >> project.properties diff --git a/srclibs/RootTools.txt b/srclibs/RootTools.txt index 289ec2e5e8..70d3dc8450 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 -e "android.library=true\ntarget=android-16\n" >> project.properties && sed -i 's/debuggable="true"/debuggable="false"/g' AndroidManifest.xml +Prepare:echo "target=android-16" >> project.properties && sed -i 's/debuggable="true"/debuggable="false"/g' AndroidManifest.xml diff --git a/srclibs/SmoothProgressBar.txt b/srclibs/SmoothProgressBar.txt index f4a20c5580..c222b7cba5 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 'android.library=true\ntarget=android-19' > project.properties +Prepare:[ -f project.properties ] || echo 'source.dir=java' > ant.properties && echo -e 'target=android-19' > project.properties diff --git a/srclibs/ViewPagerTabs.txt b/srclibs/ViewPagerTabs.txt index d0f2ae730f..22495141e2 100644 --- a/srclibs/ViewPagerTabs.txt +++ b/srclibs/ViewPagerTabs.txt @@ -1,6 +1,3 @@ Repo Type:git Repo:https://github.com/astuetz/android-viewpagertabs.git -Prepare:echo -e "android.library=true\ntarget=android-15\n" >> project.properties - - diff --git a/srclibs/Volley.txt b/srclibs/Volley.txt index 42fb8c4088..3dacb4295b 100644 --- a/srclibs/Volley.txt +++ b/srclibs/Volley.txt @@ -1,4 +1,4 @@ Repo Type:git Repo:https://android.googlesource.com/platform/frameworks/volley -Prepare:rm -rf tests/ && echo "android.library=true" >> project.properties +Prepare:rm -rf tests/