From 4d44f3fce861701535a3603f1263f75de9a95e25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Mon, 19 May 2014 11:56:30 +0200 Subject: [PATCH] Build support-v4 from source with gradle v7-appcompat can be enabled/used in gradle by changing :support-v4 with :support-appcompat-v7 in build.gradle and bumping minSdk from 5 to 7 --- .gitmodules | 4 ++++ build.gradle | 8 +++++++- extern/Support | 1 + settings.gradle | 14 +++++++++++--- 4 files changed, 23 insertions(+), 4 deletions(-) create mode 160000 extern/Support diff --git a/.gitmodules b/.gitmodules index 298c6d002..1cd325a0d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -22,3 +22,7 @@ path = extern/jmdns url = https://gitlab.com/fdroid/jmdns.git ignore = dirty +[submodule "extern/Support"] + path = extern/Support + url = https://android.googlesource.com/platform/frameworks/support + ignore = dirty diff --git a/build.gradle b/build.gradle index 25515fcab..058e683ec 100644 --- a/build.gradle +++ b/build.gradle @@ -10,9 +10,14 @@ buildscript { def toolVersion = "19.1" apply plugin: 'android' +sdkLoc = System.getenv("ANDROID_HOME") +FileCollection getAndroidPrebuilt(String apiLevel) { + files("$sdkLoc/platforms/android-$apiLevel/android.jar") +} + dependencies { - compile files('libs/android-support-v4.jar') compile files('libs/core-3.0.1.jar') + compile project(':support-v4') compile project(':extern:AndroidPinning') compile project(':extern:UniversalImageLoader:library') compile project(':extern:MemorizingTrustManager') @@ -117,3 +122,4 @@ subprojects { } } } + diff --git a/extern/Support b/extern/Support new file mode 160000 index 000000000..1c086e1e7 --- /dev/null +++ b/extern/Support @@ -0,0 +1 @@ +Subproject commit 1c086e1e7849c0b3fe31d11ea83d42bd78abcd6d diff --git a/settings.gradle b/settings.gradle index 9ee28da3a..b4af236dd 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,5 +1,13 @@ -include ':extern:AndroidPinning', - ':extern:UniversalImageLoader:library', - ':extern:MemorizingTrustManager', +include \ + ':extern:AndroidPinning', + ':extern:UniversalImageLoader:library', + ':extern:MemorizingTrustManager', ':extern:libsuperuser:libsuperuser', ':extern:nanohttpd:core' + +include ':support-v4' +project(':support-v4').projectDir = new File('extern/Support/v4') + +include ':support-appcompat-v7' +project(':support-appcompat-v7').projectDir = new File('extern/Support/v7/appcompat') +