Skip to content

Removed prebuild sed patch from ca.rmen.android.frenchcalendar.txt.

username-removed-69508 requested to merge caarmen/fdroiddata:french-calendar-remove-sed-patch into master

This is not needed. In addition to only declaring the google play services dependency in the wear flavor (not used in frdoid), like this:

wearCompile 'com.google.android.gms:play-services:6.1.71'

there is an additional check to ensure that this line is not even executed, as long as at least one of the tasks in the gradle command line contains the string "foss".

In settings.gradle:

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'

In handheld/build.gradle:

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

I understand that most projects with proprietary vs foss flavors don't have this additional check, which is why the sed patch is usually needed.

Merge request reports