missytake/fdroiddata
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'french-calendar-remove-sed-patch' into 'master'

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

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.

See merge request !1044
This commit is contained in:
Boris Kraut 2015-11-10 22:38:32 +00:00
parent 32aab4d5ac 1a055d1847
commit 0a37177894
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
metadata/ca.rmen.android.frenchcalendar.txt
View file

@ -71,13 +71,13 @@ Build:1.8.0,180
commit=release-1.8.0 commit=release-1.8.0
subdir=handheld subdir=handheld
gradle=foss gradle=foss
prebuild=sed -i '/play-services/d' build.gradle ../wearable/build.gradle scanignore=wearable/build.gradle
Build:1.8.1,181 Build:1.8.1,181
commit=release-1.8.1 commit=release-1.8.1
subdir=handheld subdir=handheld
gradle=foss gradle=foss
prebuild=sed -i '/play-services/d' build.gradle ../wearable/build.gradle scanignore=wearable/build.gradle
Auto Update Mode:Version release-%v Auto Update Mode:Version release-%v
Update Check Mode:Tags ^release- Update Check Mode:Tags ^release-