Skip to content

Commit

Permalink
Don't include the wearable module if building for foss
Browse files Browse the repository at this point in the history
  • Loading branch information
caarmen committed Nov 27, 2014
1 parent 28aaecd commit 92bd523
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 3 deletions.
6 changes: 4 additions & 2 deletions handheld/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,14 @@ android.applicationVariants.all { variant ->

dependencies {
compile 'ca.rmen:lib-french-revolutionary-calendar:1.0.6'
wearCompile 'com.google.android.gms:play-services:6.1.71'

compile project(':common')

// Package the wear apk inside this one (only for the 'wear' flavor)
wearWearApp project(':wearable')
if(rootProject.findProject("wearable") != null) {
wearCompile 'com.google.android.gms:play-services:6.1.71'
wearWearApp project(':wearable')
}
}

task deploy(dependsOn: assembleRelease) << {
Expand Down
10 changes: 9 additions & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
@@ -1 +1,9 @@
include ':handheld', ':common', ':wearable'
boolean includeWear=true;
// If we are building with a "foss" task, don't include the wearable module.
for(String taskName : startParameter.taskNames) {
if(taskName.contains("Foss"))
includeWear=false;
}
include ':handheld', ':common'
if(includeWear)
include ':wearable'

0 comments on commit 92bd523

Please sign in to comment.