parent
7c8441c9a4
commit
0d64d52f48
4 changed files with 24 additions and 22 deletions
|
@ -19,7 +19,7 @@ apply plugin: 'com.android.application'
|
||||||
|
|
||||||
android {
|
android {
|
||||||
compileSdkVersion 23
|
compileSdkVersion 23
|
||||||
buildToolsVersion "23.0.2"
|
buildToolsVersion "23.0.1"
|
||||||
|
|
||||||
signingConfigs {
|
signingConfigs {
|
||||||
development {
|
development {
|
||||||
|
@ -91,58 +91,58 @@ android {
|
||||||
productFlavors {
|
productFlavors {
|
||||||
// ABI
|
// ABI
|
||||||
armv7 {
|
armv7 {
|
||||||
dimension "abi"
|
flavorDimension "abi"
|
||||||
ndk {
|
ndk {
|
||||||
abiFilter "armeabi-v7a"
|
abiFilter "armeabi-v7a"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
armv5 {
|
armv5 {
|
||||||
dimension "abi"
|
flavorDimension "abi"
|
||||||
ndk {
|
ndk {
|
||||||
abiFilter "armeabi"
|
abiFilter "armeabi"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
x86 {
|
x86 {
|
||||||
dimension "abi"
|
flavorDimension "abi"
|
||||||
ndk {
|
ndk {
|
||||||
abiFilter "x86"
|
abiFilter "x86"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
mips {
|
mips {
|
||||||
dimension "abi"
|
flavorDimension "abi"
|
||||||
ndk {
|
ndk {
|
||||||
abiFilter "mips"
|
abiFilter "mips"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
fat {
|
fat {
|
||||||
dimension "abi"
|
flavorDimension "abi"
|
||||||
}
|
}
|
||||||
|
|
||||||
// Version
|
// Version
|
||||||
freedev {
|
freedev {
|
||||||
dimension "version"
|
flavorDimension "version"
|
||||||
applicationId "net.osmand.dev"
|
applicationId "net.osmand.dev"
|
||||||
}
|
}
|
||||||
free {
|
free {
|
||||||
dimension "version"
|
flavorDimension "version"
|
||||||
applicationId "net.osmand"
|
applicationId "net.osmand"
|
||||||
}
|
}
|
||||||
full {
|
full {
|
||||||
dimension "version"
|
flavorDimension "version"
|
||||||
applicationId "net.osmand.plus"
|
applicationId "net.osmand.plus"
|
||||||
}
|
}
|
||||||
|
|
||||||
// CoreVersion
|
// CoreVersion
|
||||||
legacy {
|
legacy {
|
||||||
dimension "coreversion"
|
flavorDimension "coreversion"
|
||||||
}
|
}
|
||||||
|
|
||||||
qtcore {
|
qtcore {
|
||||||
dimension "coreversion"
|
flavorDimension "coreversion"
|
||||||
}
|
}
|
||||||
|
|
||||||
qtcoredebug {
|
qtcoredebug {
|
||||||
dimension "coreversion"
|
flavorDimension "coreversion"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -3,7 +3,7 @@ buildscript {
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
}
|
}
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath 'com.android.tools.build:gradle:2.0.0'
|
classpath 'com.android.tools.build:gradle:1.1.3'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,16 +1,18 @@
|
||||||
## Project-wide Gradle settings.
|
# Project-wide Gradle settings.
|
||||||
#
|
|
||||||
|
# IDE (e.g. Android Studio) users:
|
||||||
|
# Settings specified in this file will override any Gradle settings
|
||||||
|
# configured through the IDE.
|
||||||
|
|
||||||
# For more details on how to configure your build environment visit
|
# For more details on how to configure your build environment visit
|
||||||
# http://www.gradle.org/docs/current/userguide/build_environment.html
|
# http://www.gradle.org/docs/current/userguide/build_environment.html
|
||||||
#
|
|
||||||
# Specifies the JVM arguments used for the daemon process.
|
# Specifies the JVM arguments used for the daemon process.
|
||||||
# The setting is particularly useful for tweaking memory settings.
|
# The setting is particularly useful for tweaking memory settings.
|
||||||
# Default value: -Xmx10248m -XX:MaxPermSize=256m
|
# Default value: -Xmx10248m -XX:MaxPermSize=256m
|
||||||
# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
|
# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
|
||||||
#
|
|
||||||
# When configured, Gradle will run in incubating parallel mode.
|
# When configured, Gradle will run in incubating parallel mode.
|
||||||
# This option should only be used with decoupled projects. More details, visit
|
# This option should only be used with decoupled projects. More details, visit
|
||||||
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
|
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
|
||||||
# org.gradle.parallel=true
|
# org.gradle.parallel=true
|
||||||
#Fri Apr 08 18:47:31 EEST 2016
|
|
||||||
android.useDeprecatedNdk=true
|
|
4
gradle/wrapper/gradle-wrapper.properties
vendored
4
gradle/wrapper/gradle-wrapper.properties
vendored
|
@ -1,6 +1,6 @@
|
||||||
#Fri Apr 08 17:52:02 EEST 2016
|
#Mon Sep 01 10:23:06 EEST 2014
|
||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
|
||||||
|
|
Loading…
Reference in a new issue