Merge branch 'microg/master' (e6105b28) · Commits · e / os / GmsCore

.travis.yml

+1 −1

Original line number	Diff line number	Diff line
		@@ -5,7 +5,7 @@ script:
		- echo sdk.dir $ANDROID_HOME > local.properties
		- export TERM=dumb
		- export JAVA_OPTS="-XX:+CMSClassUnloadingEnabled -XX:+HeapDumpOnOutOfMemoryError -Xmx2048m"
		- ./gradlew assemble
		- ./gradlew --stacktrace assemble
		android:
		components:
		- tools

build.gradle

+1 −1

Original line number	Diff line number	Diff line
		@@ -20,7 +20,7 @@ buildscript {
		google()
		}
		dependencies {
		classpath 'com.android.tools.build:gradle:3.1.0'
		classpath 'com.android.tools.build:gradle:3.1.3'
		classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
		}
		}

gradle/wrapper/gradle-wrapper.properties

+1 −2

Original line number	Diff line number	Diff line
		#Tue Feb 7 18:49:43 UTC 2017
		distributionBase=GRADLE_USER_HOME
		distributionPath=wrapper/dists
		zipStoreBase=GRADLE_USER_HOME
		zipStorePath=wrapper/dists
		distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-all.zip
		distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-all.zip

play-services-core/build.gradle

+16 −18

Original line number	Diff line number	Diff line
		@@ -37,35 +37,33 @@ dependencies {
		implementation project(':vtm-microg-theme')
		}

		String getMyVersionName() {
		def execResult(...args) {
		def stdout = new ByteArrayOutputStream()
		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() {
		def stdout = new ByteArrayOutputStream()
		exec {
		commandLine 'git', 'rev-list', '--count', "HEAD"
		commandLine args
		standardOutput = stdout
		}
		return Integer.parseInt(stdout.toString().trim())
		return stdout.toString().trim()
		}

		def gmsVersion = "12.8.79"
		def gmsVersionCode = Integer.parseInt(gmsVersion.replaceAll('\\.', ''))
		def gitVersionBase = execResult('git', 'describe', '--tags', '--abbrev=0').substring(1)
		def gitCommitCount = Integer.parseInt(execResult('git', 'rev-list', '--count', "v$gitVersionBase..HEAD"))
		def gitCommitId = execResult('git', 'show-ref', '--abbrev=7', '--head', 'HEAD').split(' ')[0]
		def gitDirty = execResult('git', 'status', '--porcelain').size() > 0
		def ourVersionBase = gitVersionBase.substring(0, gitVersionBase.lastIndexOf('.'))
		def ourVersionCode = gmsVersionCode * 1000 + gitCommitCount + (gitDirty ? 1 : 0)
		def ourVersionName = "$ourVersionBase.$gmsVersionCode" + (gitCommitCount > 0 ? "-$gitCommitCount-$gitCommitId" : "") + (gitDirty ? "-dirty" : "")
		logger.lifecycle('Starting build for version {} ({})...', ourVersionName, ourVersionCode)

		android {
		compileSdkVersion androidCompileSdk()
		buildToolsVersion "$androidBuildVersionTools"

		defaultConfig {
		versionName getMyVersionName()
		def x = getMyVersionCode() - 367
		// We are not allowed to freely choose the hundreds column as it defines the device type
		versionCode(12451000 + x % 100 + ((int) (x / 100)) * 1000)
		versionName ourVersionName
		versionCode ourVersionCode

		minSdkVersion androidMinSdk()
		targetSdkVersion androidTargetSdk()

play-services-core/src/main/AndroidManifest.xml

+14 −0

Original line number	Diff line number	Diff line
		@@ -491,6 +491,20 @@

		<!-- Other -->

		<provider
		android:name="org.microg.gms.phenotype.ConfigurationProvider"
		android:authorities="com.google.android.gms.phenotype"
		android:exported="true"/>

		<service
		android:name="org.microg.gms.measurement.MeasurementBrokerService"
		android:exported="true">
		<intent-filter>
		<action android:name="com.google.android.gms.measurement.START"/>

		<category android:name="android.intent.category.DEFAULT"/>
		</intent-filter>
		</service>
		<service android:name="org.microg.gms.mdm.NetworkQualityService">
		<intent-filter>
		<action android:name="com.google.android.gms.mdm.services.START"/>