finish ant/gradle build for appcompat-v7

Both preferencefragment and appcompat-v7 submodules need the
android-support-v4.jar to be included in their respective libs/ dirs in
order for ant to build those projects.
This commit is contained in:
Hans-Christoph Steiner 2014-06-04 23:12:49 -04:00
parent 208146882e
commit 81cbef82b4
4 changed files with 25 additions and 0 deletions

View File

@ -1,10 +1,14 @@
#!/bin/bash -ex #!/bin/bash -ex
target=`sed -n 's,^target=\(.*\),\1,p' project.properties`
android update lib-project --path extern/UniversalImageLoader/library android update lib-project --path extern/UniversalImageLoader/library
android update lib-project --path extern/AndroidPinning android update lib-project --path extern/AndroidPinning
android update lib-project --path extern/MemorizingTrustManager android update lib-project --path extern/MemorizingTrustManager
android update lib-project --path extern/libsuperuser/libsuperuser android update lib-project --path extern/libsuperuser/libsuperuser
android update lib-project --path extern/zxing-core android update lib-project --path extern/zxing-core
android update lib-project --path extern/android-support-v4-preferencefragment
android update lib-project --path extern/Support/v7/appcompat --target $target
android update project --path . --name F-Droid android update project --path . --name F-Droid
{ echo -e "\nSuccessfully updated the main project.\n"; } 2>/dev/null { echo -e "\nSuccessfully updated the main project.\n"; } 2>/dev/null

View File

@ -125,6 +125,15 @@ android.applicationVariants.all { variant ->
// This is the hacky way which we force the subprojects to use the same build tools: // This is the hacky way which we force the subprojects to use the same build tools:
// http://stackoverflow.com/a/21032272 // http://stackoverflow.com/a/21032272
subprojects { subprojects {
// The support-v4 library assumes certain things are defined in the
// root project (which is usually the android-support project, but
// this time it is the F-Droid project.
if (project.name.equals("support-v4")) {
apply plugin: 'maven'
rootProject.ext.supportRepoOut = ""
}
afterEvaluate { afterEvaluate {
android { android {

View File

@ -1,6 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project name="custom_rules"> <project name="custom_rules">
<target name="-pre-build">
<echo message="Copying a bunch of files around to make F-Droid and its submodules build" />
<copy tofile="extern/android-support-v4-preferencefragment/libs/android-support-v4.jar"
file="libs/android-support-v4.jar" />
<copy tofile="extern/Support/v7/appcompat/libs/android-support-v4.jar"
file="libs/android-support-v4.jar" />
</target>
<target name="javadoc" description="Generate Javadocs"> <target name="javadoc" description="Generate Javadocs">
<javadoc sourcepath="${source.dir}" <javadoc sourcepath="${source.dir}"
destdir="${out.dir}/javadoc" destdir="${out.dir}/javadoc"

View File

@ -7,6 +7,8 @@ android.library.reference.2=extern/MemorizingTrustManager
android.library.reference.3=extern/AndroidPinning android.library.reference.3=extern/AndroidPinning
android.library.reference.4=extern/libsuperuser/libsuperuser android.library.reference.4=extern/libsuperuser/libsuperuser
android.library.reference.5=extern/zxing-core android.library.reference.5=extern/zxing-core
android.library.reference.6=extern/android-support-v4-preferencefragment
android.library.reference.7=extern/Support/v7/appcompat
# For java libraries, place symlinks in extern/symlinks-for-ant-and-eclipse/ # For java libraries, place symlinks in extern/symlinks-for-ant-and-eclipse/
source.dir=src;extern/symlinks-for-ant-and-eclipse source.dir=src;extern/symlinks-for-ant-and-eclipse