Commit 885f9ae2 authored by John Taylor's avatar John Taylor

Move the tools to the correct location

parent bfebe4ac
......@@ -10,6 +10,7 @@
<set>
<option value="$PROJECT_DIR$" />
<option value="$PROJECT_DIR$/app" />
<option value="$PROJECT_DIR$/tools" />
</set>
</option>
</GradleProjectSettings>
......
......@@ -11,6 +11,8 @@ android {
versionCode 1113
versionName "1.6.5"
}
// Set the environment variables KSTOREPWD and KEYPWD to the keystore
// and key passwords to generate a signed release..
signingConfigs {
release {
storeFile file("stardroid-release-key.keystore")
......@@ -22,12 +24,13 @@ android {
buildTypes {
release {
minifyEnabled false
signingConfig signingConfigs.release
if (System.getenv("KSTOREPWD") != null) {
signingConfig signingConfigs.release
}
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard.cfg'
}
}
lintOptions {
// Lint complains because of missing translations.
// TODO(jontayler): fix the missing translations.
......
include ':app'
include ':app', ':tools'
apply plugin: 'java'
dependencies {
compile project(':app')
// TODO(jontayler): Terrible hack that should go when we revamp the tools.
compile files('../app/build/intermediates/classes/release/')//.filter{!it.toString().contains("SourceFullProto")}
//compile fileTree(include: ['**/*.*'], dir: '../app/build/intermediates/classes/release')
compile fileTree(include: ['*.jar'], dir: 'libs')
}
task printit << {
System.out.println(project(':app').sourceSets['main'])
System.out.println(project(':app').getBuildDir())
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment