Apply /e/OS patch (530ce2c1) · Commits · e / os / GmsCore

.gitignore

+5 −4

Original line number	Original line	Diff line number	Diff line
	@@ -4,10 +4,11 @@ bin/
	build/		build/
	.gradle/		.gradle/
	.idea/		.idea/
	user.gradle
	local.properties		local.properties
	.directory		.directory
			bin/
	.settings
	.classpath
	.project		.project
			.classpath
			.output/
			.settings/
			*keystore

.gitlab-ci.yml

0 → 100644

+79 −0

Original line number	Original line	Diff line number	Diff line
			image: "registry.gitlab.e.foundation/e/os/docker-android-apps-cicd:latest"

			stages:
			- build
			- publish

			variables:
			GIT_SUBMODULE_STRATEGY: recursive

			before_script:
			- if [ -d "/srv/userscripts" ]; then cp -R userscripts/* /srv/userscripts ; fi
			- 'which ssh-agent \|\| ( apt-get update -y && apt-get install openssh-client -y )'
			- eval $(ssh-agent -s)
			- echo "$SSH_PRIVATE_KEY" \| tr -d '\r' \| ssh-add - > /dev/null
			- mkdir -p ~/.ssh
			- chmod 700 ~/.ssh
			- echo "$SSH_KNOWN_HOSTS" > ~/.ssh/known_hosts
			- chmod 644 ~/.ssh/known_hosts
			- export GRADLE_USER_HOME=$(pwd)/.gradle
			- chmod +x ./gradlew

			.default_before_script: &default_before_script
			- echo sdk.dir $ANDROID_HOME > local.properties
			- echo mapbox.key $MAPBOX_KEY >> local.properties
			- echo mapbox.enabled true >> local.properties
			- echo ichnaea.key $ICHNAEA_KEY >> local.properties
			- echo stadia.key $STADIA_KEY >> local.properties
			- echo modules.hms false >> local.properties
			- echo ichnaea.endpoint $ICHNAEA_ENDPOINT >> local.properties
			- echo "${KEYSTORE}" \| base64 -d > play-services-core/e.keystore
			- export TERM=dumb
			- export JAVA_OPTS="-XX:+HeapDumpOnOutOfMemoryError -Xmx4096m"

			cache:
			key: ${CI_PROJECT_ID}
			paths:
			- .gradle/

			build:
			stage: build
			rules:
			- if: $CI_COMMIT_TAG && $CI_COMMIT_REF_PROTECTED == "true"
			- when: always
			before_script:
			- *default_before_script
			- echo modules.nearby false >> local.properties
			script:
			- ./gradlew assembleDebug
			- ./gradlew assembleRelease
			artifacts:
			paths:
			- play-services-core/build/outputs/apk/
			- vending-app/build/outputs/apk/

			build-nearby:
			extends: build
			stage: build
			rules:
			- if: $CI_COMMIT_TAG && $CI_COMMIT_REF_PROTECTED == "true"
			- when: always
			before_script:
			- *default_before_script
			- echo modules.nearby true >> local.properties
			script:
			- ./gradlew assembleDebug
			- ./gradlew assembleRelease

			publish:
			stage: publish
			rules:
			- if: $CI_COMMIT_TAG && $CI_COMMIT_REF_PROTECTED == "true"
			when: manual
			script:
			- \|
			curl --fail --output "/dev/null" --silent --show-error \
			--header 'Content-Type: application/json' --header "PRIVATE-TOKEN: ${PUBLICATION_TOKEN}" \
			--data "{\"ref\":\"${CI_COMMIT_SHA}\",\"name\":\"${CI_COMMIT_TAG}\",\"tag_name\":\"${CI_COMMIT_TAG}\",\"description\":\"${CI_COMMIT_TITLE}\",\"assets\":{\"links\":[{\"name\":\"GmsCore-test.apk\",\"url\":\"https://gitlab.e.foundation/api/v4/projects/149/jobs/artifacts/${CI_COMMIT_TAG}/raw/play-services-core/build/outputs/apk/mapboxDefault/releaseTest/play-services-core-withMapbox-withNearby-releaseTest.apk?job=build-nearby\",\"link_type\":\"package\"},{\"name\":\"GmsCore-dev.apk\",\"url\":\"https://gitlab.e.foundation/api/v4/projects/149/jobs/artifacts/${CI_COMMIT_TAG}/raw/play-services-core/build/outputs/apk/mapboxDefault/releaseDev/play-services-core-mapbox-default-releaseDev.apk?job=build-nearby\",\"link_type\":\"package\"},{\"name\":\"GmsCore-stable.apk\",\"url\":\"https://gitlab.e.foundation/api/v4/projects/149/jobs/artifacts/${CI_COMMIT_TAG}/raw/play-services-core/build/outputs/apk/mapboxDefault/releaseStable/play-services-core-mapbox-default-releaseStable.apk?job=build-nearby\",\"link_type\":\"package\"}]}}" \
			--request POST https://gitlab.e.foundation/api/v4/projects/149/releases

Android.mk

+5 −1

Original line number	Original line	Diff line number	Diff line
	@@ -19,6 +19,10 @@ LOCAL_MODULE := GmsCore
	LOCAL_MODULE_TAGS := optional		LOCAL_MODULE_TAGS := optional
	LOCAL_PACKAGE_NAME := GmsCore		LOCAL_PACKAGE_NAME := GmsCore

			LOCAL_PRIVATE_PLATFORM_APIS := true

			LOCAL_STATIC_JAVA_LIBRARIES += org.lineageos.platform.sdk

	gmscore_root := $(LOCAL_PATH)		gmscore_root := $(LOCAL_PATH)
	gmscore_dir := play-services-core		gmscore_dir := play-services-core
	gmscore_out := $(TARGET_COMMON_OUT_ROOT)/obj/APPS/$(LOCAL_MODULE)_intermediates		gmscore_out := $(TARGET_COMMON_OUT_ROOT)/obj/APPS/$(LOCAL_MODULE)_intermediates

build.gradle

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -33,7 +33,7 @@ buildscript {

	ext.androidBuildVersionTools = '34.0.0'		ext.androidBuildVersionTools = '34.0.0'

	ext.androidMinSdk = 19		ext.androidMinSdk = 21
	ext.androidTargetSdk = 29		ext.androidTargetSdk = 29
	ext.androidCompileSdk = 34		ext.androidCompileSdk = 34

	@@ -54,6 +54,7 @@ buildscript {
	repositories {		repositories {
	mavenCentral()		mavenCentral()
	google()		google()
			maven { url 'https://gitlab.e.foundation/api/v4/groups/9/-/packages/maven'}
	}		}

	dependencies {		dependencies {
	@@ -116,7 +117,7 @@ subprojects {
	repositories {		repositories {
	mavenCentral()		mavenCentral()
	google()		google()
			maven { url 'https://gitlab.e.foundation/api/v4/groups/9/-/packages/maven'}
	if (hasModule("hms", false)) maven {url 'https://developer.huawei.com/repo/'}		if (hasModule("hms", false)) maven {url 'https://developer.huawei.com/repo/'}
	}		}
	}		}

firebase-auth/core/src/main/AndroidManifest.xml

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -19,6 +19,6 @@
	android:name="org.microg.gms.firebase.auth.ReCaptchaActivity"		android:name="org.microg.gms.firebase.auth.ReCaptchaActivity"
	android:exported="false"		android:exported="false"
	android:process=":ui"		android:process=":ui"
	android:theme="@style/Theme.AppCompat.Light.Dialog.Alert.NoActionBar" />		android:theme="@style/Theme.AppCompat.DayNight.Dialog.Alert.NoActionBar" />
	</application>		</application>
	</manifest>		</manifest>