Merge remote-tracking branch 'upstream/master' (12ffe814) · Commits · e / os / GmsCore

.tx/config

deleted100644 → 0

+0 −21

Original line number	Diff line number	Diff line
		[main]
		host = https://www.transifex.com
		lang_map = he: iw, zh_TW: zh-rTW, es_MX: es-rMX, pt_BR: pt-rBR

		[gmscore.strings]
		file_filter = play-services-core/src/main/res/values-<lang>/strings.xml
		source_file = play-services-core/src/main/res/values/strings.xml
		source_lang = en
		type = ANDROID

		[gmscore.plurals]
		file_filter = play-services-core/src/main/res/values-<lang>/plurals.xml
		source_file = play-services-core/src/main/res/values/plurals.xml
		source_lang = en
		type = ANDROID

		[gmscore.permissions]
		file_filter = play-services-core/src/main/res/values-<lang>/permissions.xml
		source_file = play-services-core/src/main/res/values/permissions.xml
		source_lang = en
		type = ANDROID

build.gradle

+20 −7

Original line number	Diff line number	Diff line
		@@ -39,11 +39,17 @@ buildscript {
		ext.localProperties = new Properties()

		try {
		ext.localProperties.load(rootProject.file('local.properties').newDataInputStream())
		var stream = rootProject.file('local.properties').newDataInputStream()
		ext.localProperties.load(stream)
		stream.close()
		} catch (ignored) {
		// Ignore
		}

		ext.hasModule = (String name, boolean enabledByDefault) -> {
		return ext.localProperties.getProperty("modules." + name, enabledByDefault.toString()).toBoolean()
		}

		repositories {
		mavenCentral()
		google()
		@@ -66,8 +72,10 @@ def execResult(...args) {
		return stdout.toString()
		}

		def gmsVersion = "23.30.13"
		def gmsVersion = "23.35.15"
		def gmsVersionCode = Integer.parseInt(gmsVersion.replaceAll('\\.', ''))
		def vendingVersion = "37.5.24"
		def vendingVersionCode = Integer.parseInt(vendingVersion.replaceAll('\\.', ''))
		def gitVersionBase = execResult('git', 'describe', '--tags', '--abbrev=0', '--match=v[0-9]*').trim().substring(1)
		def gitCommitCount = Integer.parseInt(execResult('git', 'rev-list', '--count', "v$gitVersionBase..HEAD").trim())
		def gitCommitId = execResult('git', 'show-ref', '--abbrev=7', '--head', 'HEAD').trim().split(' ')[0]
		@@ -89,16 +97,20 @@ execResult('git', 'status', '--porcelain').lines().each { stat ->
		}
		def ourVersionBase = gitVersionBase.substring(0, gitVersionBase.lastIndexOf('.'))
		def ourVersionMinor = Integer.parseInt(ourVersionBase.substring(ourVersionBase.lastIndexOf('.') + 1))
		def ourVersionCode = gmsVersionCode * 1000 + ourVersionMinor * 2 + (gitCommitCount > 0 \|\| gitDirty ? 1 : 0)
		def ourVersionName = "$ourVersionBase.$gmsVersionCode" + (gitCommitCount > 0 && !gitDirty ? "-$gitCommitCount" : "") + (gitDirty ? "-dirty" : "") + (gitCommitCount > 0 && !gitDirty ? " ($gitCommitId)" : "")
		logger.lifecycle('Starting build for version {} ({})...', ourVersionName, ourVersionCode)
		def ourGmsVersionCode = gmsVersionCode * 1000 + ourVersionMinor * 2 + (gitCommitCount > 0 \|\| gitDirty ? 1 : 0)
		def ourGmsVersionName = "$ourVersionBase.$gmsVersionCode" + (gitCommitCount > 0 && !gitDirty ? "-$gitCommitCount" : "") + (gitDirty ? "-dirty" : "") + (gitCommitCount > 0 && !gitDirty ? " ($gitCommitId)" : "")
		def ourVendingVersionCode = 80000000 + vendingVersionCode * 100 + ourVersionMinor * 2 + (gitCommitCount > 0 \|\| gitDirty ? 1 : 0)
		def ourVendingVersionName = "$ourVersionBase.$vendingVersionCode" + (gitCommitCount > 0 && !gitDirty ? "-$gitCommitCount" : "") + (gitDirty ? "-dirty" : "") + (gitCommitCount > 0 && !gitDirty ? " ($gitCommitId)" : "")
		logger.lifecycle('Starting build for GMS version {} ({})...', ourGmsVersionName, ourGmsVersionCode)

		allprojects {
		apply plugin: 'idea'

		group = 'org.microg.gms'
		version = ourVersionName
		ext.appVersionCode = ourVersionCode
		version = ourGmsVersionName
		ext.vendingAppVersionName = ourVendingVersionName
		ext.vendingAppVersionCode = ourVendingVersionCode
		ext.appVersionCode = ourGmsVersionCode
		ext.isReleaseVersion = false
		}

		@@ -107,5 +119,6 @@ subprojects {
		mavenCentral()
		google()
		maven { url 'https://gitlab.e.foundation/api/v4/groups/9/-/packages/maven'}
		if (hasModule("hms", false)) maven {url 'https://developer.huawei.com/repo/'}
		}
		}

fake-signature/build.gradle

+10 −0

Original line number	Diff line number	Diff line
		@@ -14,6 +14,16 @@ android {
		targetSdk androidTargetSdk
		}

		flavorDimensions = ['target']
		productFlavors {
		"default" {
		dimension 'target'
		}
		"huawei" {
		dimension 'target'
		}
		}

		buildFeatures {
		aidl = true
		}

fake-signature/src/huawei/AndroidManifest.xml

0 → 100644

+43 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?><!--
		~ SPDX-FileCopyrightText: 2023 microG Project Team
		~ SPDX-License-Identifier: Apache-2.0
		-->

		<manifest xmlns:android="http://schemas.android.com/apk/res/android">

		<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />

		<application>
		<receiver
		android:name="com.huawei.signature.diff.InitReceiver"
		android:enabled="true"
		android:exported="true">
		<intent-filter>
		<action android:name="android.intent.action.BOOT_COMPLETED" />
		<action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
		<action android:name="android.intent.action.PACKAGE_RESTARTED" />

		<category android:name="android.intent.category.DEFAULT" />
		</intent-filter>
		</receiver>

		<provider
		android:name="com.huawei.signature.diff.InitProvider"
		android:authorities="${applicationId}.signature.diff.init"
		android:enabled="true"
		android:exported="false"
		android:initOrder="1000" />

		<service
		android:name="com.huawei.signature.diff.SignatureService"
		android:process=":signature"
		android:exported="true">
		<intent-filter>
		<action android:name="com.huawei.signature.diff" />

		<category android:name="android.intent.category.DEFAULT" />
		</intent-filter>
		</service>
		</application>

		</manifest>
		No newline at end of file

fake-signature/src/main/aidl/com/huawei/signature/diff/ISignatureService.aidl→fake-signature/src/huawei/aidl/com/huawei/signature/diff/ISignatureService.aidl

+0 −0

File moved.

View file