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

Commit 13c267d5 authored by Romain Hunault's avatar Romain Hunault 💻
Browse files

Merge branch 'dev' into 'master' 

[RELEASE] Sprint Freetown

See merge request e/apps/GmsCore!14
parents d20d93a9 c34da53c

.gitlab-ci.yml

+4 −2
Original line number Diff line number Diff line
@@ -3,6 +3,9 @@ image: "registry.gitlab.e.foundation:5000/e/apps/docker-android-apps-cicd:latest 
stages:

- build



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 )'
@@ -23,12 +26,11 @@ cache: 
build:

  stage: build

  script:

  - git submodule update --recursive --init

  - echo sdk.dir $ANDROID_HOME > local.properties

  - echo mapbox.key $MAPBOX_KEY >> local.properties

  - echo mapbox.enabled true >> local.properties

  - export TERM=dumb

  - export JAVA_OPTS="-XX:+CMSClassUnloadingEnabled -XX:+HeapDumpOnOutOfMemoryError -Xmx2048m"

  - export JAVA_OPTS="-XX:+CMSClassUnloadingEnabled -XX:+HeapDumpOnOutOfMemoryError -Xmx4096m"

  - ./gradlew assemble

  artifacts:

    paths:

.gitmodules

+10 −5
Original line number Diff line number Diff line 
[submodule "extern/UnifiedNlp"]

	path = extern/UnifiedNlp

	url = ../android_packages_apps_UnifiedNlp.git

	url = https://gitlab.e.foundation/e/apps/android_packages_apps_UnifiedNlp

	branch = dev

[submodule "extern/GmsApi"]

	path = extern/GmsApi

	url = https://github.com/microg/android_external_GmsApi.git

	url = https://gitlab.e.foundation/e/apps/GmsApi

	branch = dev

[submodule "extern/Wearable"]

	path = extern/Wearable

	url = https://github.com/microg/android_external_Wearable.git

	url = https://gitlab.e.foundation/e/apps/Wearable

	branch = dev

[submodule "extern/GmsLib"]

	path = extern/GmsLib

	url = https://github.com/microg/android_external_GmsLib.git

	url = https://gitlab.e.foundation/e/apps/GmsLib

	branch = dev

[submodule "extern/RemoteDroidGuard"]

	path = extern/RemoteDroidGuard

	url = https://github.com/microg/android_packages_apps_RemoteDroidGuard.git
 
	url = https://gitlab.e.foundation/e/apps/android_packages_apps_RemoteDroidGuard

	branch = dev

GmsApi @ 09bf9494

Original line number Diff line number Diff line 
Subproject commit 2a43448e49dc0aec0d6c53c8a27dd58245fdaba6
 
Subproject commit 09bf9494038ab53e0b86d8699db409b955fe3c0c

GmsLib @ 614e111f

Original line number Diff line number Diff line 
Subproject commit 15cd4491bcca57d627796b35b69bdf8c97564792
 
Subproject commit 614e111fa02b9aeb195879735ababe869074617c

RemoteDroidGuard @ 0c5c944a

Original line number Diff line number Diff line 
Subproject commit 47073dd7a2a039593fe556af8f9f33e325febfa7
 
Subproject commit 0c5c944a54962a4c60cffa44785a36d7251df635