update android build-tools
This commit is contained in:
parent
62255e7583
commit
fbfe17743e
@ -17,10 +17,10 @@ before_install:
|
|||||||
- export ANDROID_HOME=$PWD/android-sdk-linux
|
- export ANDROID_HOME=$PWD/android-sdk-linux
|
||||||
- export PATH=${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools
|
- export PATH=${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools
|
||||||
# install android build tools
|
# install android build tools
|
||||||
- wget https://dl-ssl.google.com/android/repository/build-tools_r19.0.1-linux.zip
|
- wget https://dl-ssl.google.com/android/repository/build-tools_r19.0.3-linux.zip
|
||||||
- unzip build-tools_r19.0.1-linux.zip -d $ANDROID_HOME
|
- unzip build-tools_r19.0.3-linux.zip -d $ANDROID_HOME
|
||||||
- mkdir -p $ANDROID_HOME/build-tools/
|
- mkdir -p $ANDROID_HOME/build-tools/
|
||||||
- mv $ANDROID_HOME/android-4.4.2 $ANDROID_HOME/build-tools/19.0.1
|
- mv $ANDROID_HOME/android-4.4.2 $ANDROID_HOME/build-tools/19.0.3
|
||||||
# Install required components.
|
# Install required components.
|
||||||
# For a full list, run `android list sdk -a --extended`
|
# For a full list, run `android list sdk -a --extended`
|
||||||
# Note that sysimg-18 downloads the ARM, x86 and MIPS images (we should optimize this).
|
# Note that sysimg-18 downloads the ARM, x86 and MIPS images (we should optimize this).
|
||||||
|
@ -35,7 +35,7 @@ VTM is part of the OpenScienceMap project and developed at University of Bremen.
|
|||||||
|
|
||||||
`git clone --recursive https://github.com/opensciencemap/vtm`
|
`git clone --recursive https://github.com/opensciencemap/vtm`
|
||||||
|
|
||||||
Install Android SDK and build-tools 19.0.1. From extras add
|
Install Android SDK and build-tools 19.0.3. From extras add
|
||||||
'Android Support Library/Repository' and 'Google Repository'.
|
'Android Support Library/Repository' and 'Google Repository'.
|
||||||
The commands below should set things up correctly when Android
|
The commands below should set things up correctly when Android
|
||||||
SDK is already installed.
|
SDK is already installed.
|
||||||
@ -43,6 +43,10 @@ SDK is already installed.
|
|||||||
export ANDROID_HOME=/path/to/your/android-sdk
|
export ANDROID_HOME=/path/to/your/android-sdk
|
||||||
./android-stuff.sh
|
./android-stuff.sh
|
||||||
```
|
```
|
||||||
|
To use a different build-tools version (x) run:
|
||||||
|
```
|
||||||
|
find -name build.gradle | xargs sed -i 's/19.0.3/19.0.x/g'
|
||||||
|
```
|
||||||
|
|
||||||
### Eclipse
|
### Eclipse
|
||||||
`./gradlew eclipse`<br/>
|
`./gradlew eclipse`<br/>
|
||||||
|
@ -14,6 +14,8 @@
|
|||||||
# POM_DEVELOPER_NAME=Hannes Janetzek
|
# POM_DEVELOPER_NAME=Hannes Janetzek
|
||||||
|
|
||||||
org.gradle.daemon=true
|
org.gradle.daemon=true
|
||||||
org.gradle.configureondemand=true
|
|
||||||
org.gradle.jvmargs=-Xmx1024m -XX:MaxPermSize=512m
|
org.gradle.jvmargs=-Xmx1024m -XX:MaxPermSize=512m
|
||||||
#org.gradle.parallel=true
|
|
||||||
|
# options to speed up compilation once everything else is working:
|
||||||
|
org.gradle.parallel=false
|
||||||
|
org.gradle.configureondemand=false
|
||||||
|
@ -1 +1 @@
|
|||||||
Subproject commit 2a18af29d54dc057f050cb7ce6d8189deffec9e8
|
Subproject commit bf445ffd8080f638ce965e0646408ce7e3a4efc5
|
@ -22,7 +22,7 @@ dependencies {
|
|||||||
|
|
||||||
android {
|
android {
|
||||||
compileSdkVersion 19
|
compileSdkVersion 19
|
||||||
buildToolsVersion '19.0.1'
|
buildToolsVersion '19.0.3'
|
||||||
|
|
||||||
sourceSets {
|
sourceSets {
|
||||||
main {
|
main {
|
||||||
@ -86,4 +86,4 @@ task run (dependsOn: 'installDebug'){
|
|||||||
proc.err.eachLine {line -> System.err.println( 'ERROR: ' + line)}
|
proc.err.eachLine {line -> System.err.println( 'ERROR: ' + line)}
|
||||||
proc.waitFor()
|
proc.waitFor()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -37,7 +37,7 @@ dependencies {
|
|||||||
|
|
||||||
android {
|
android {
|
||||||
compileSdkVersion 19
|
compileSdkVersion 19
|
||||||
buildToolsVersion '19.0.1'
|
buildToolsVersion '19.0.3'
|
||||||
|
|
||||||
sourceSets {
|
sourceSets {
|
||||||
main {
|
main {
|
||||||
|
@ -20,7 +20,7 @@ dependencies {
|
|||||||
|
|
||||||
android {
|
android {
|
||||||
compileSdkVersion 19
|
compileSdkVersion 19
|
||||||
buildToolsVersion '19.0.1'
|
buildToolsVersion '19.0.3'
|
||||||
|
|
||||||
sourceSets {
|
sourceSets {
|
||||||
main {
|
main {
|
||||||
|
@ -35,7 +35,7 @@ dependencies {
|
|||||||
|
|
||||||
android {
|
android {
|
||||||
compileSdkVersion 19
|
compileSdkVersion 19
|
||||||
buildToolsVersion '19.0.1'
|
buildToolsVersion '19.0.3'
|
||||||
|
|
||||||
sourceSets {
|
sourceSets {
|
||||||
main {
|
main {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user