Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2a394f98 authored by Marvin W.'s avatar Marvin W. 🐿️
Browse files

Various changes 

- Extend Wear support
- Rework Gms Services
- Fix ProGuard
- Add Waze to Google Whitelist (as in original Play Services, fixes #116)
parent 62408d03

GmsApi @ 6aa11065

Compare 75562ce8 to 6aa11065
Original line number Diff line number Diff line 
Subproject commit 75562ce8b6d19fccde3ca46ab853513f48832a05
 
Subproject commit 6aa110657beec0b3e6c26d1030943e0b97683335

UnifiedNlp @ 97b01d50

Compare d184e0e7 to 97b01d50
Original line number Diff line number Diff line 
Subproject commit d184e0e7f10aaad979019d3efe5fc10a68299849
 
Subproject commit 97b01d50d4fc54061ff8495e92217f31454acd0a

Wearable @ 5c24adaa

Compare c12fe119 to 5c24adaa
Original line number Diff line number Diff line 
Subproject commit c12fe119c8f71b4e7b458f480270f686dae34343
 
Subproject commit 5c24adaa3928de68167ce31c0fa5b9b1a3256677

gradle/wrapper/gradle-wrapper.properties

+1 −1
Original line number Diff line number Diff line
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME 
distributionPath=wrapper/dists

zipStoreBase=GRADLE_USER_HOME

zipStorePath=wrapper/dists

distributionUrl=https\://services.gradle.org/distributions/gradle-2.6-all.zip
 
distributionUrl=https\://services.gradle.org/distributions/gradle-2.12-all.zip

play-services-core/build.gradle

+6 −6
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ buildscript { 
        jcenter()

    }

    dependencies {

        classpath 'com.android.tools.build:gradle:1.5.0'

        classpath 'com.android.tools.build:gradle:2.0.0'

    }

}
@@ -56,11 +56,11 @@ dependencies { 


String getMyVersionName() {

    def stdout = new ByteArrayOutputStream()

    exec {

        commandLine 'git', 'describe', '--tags', '--always', '--dirty'

        standardOutput = stdout

    }

    return stdout.toString().trim()

    if (rootProject.file("gradlew").exists())

        exec { commandLine 'git', 'describe', '--tags', '--always', '--dirty'; standardOutput = stdout }

    else // automatic build system, don't tag dirty

        exec { commandLine 'git', 'describe', '--tags', '--always'; standardOutput = stdout }

    return stdout.toString().trim().substring(1)

}



int getMyVersionCode(String ref) {