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

Commit 3333ddd7 authored by Romain Hunault's avatar Romain Hunault 💻
Browse files

Merge branch '6-DroidGuard_crashes' into 'dev' 

Pointing RemoteDroidGuard submodule to fix, and updating all submodules to use dev branch

See merge request e/apps/GmsCore!12
parents 89dbb73a 01447e02

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ stages: 
- build



variables:

  GIT_SUBMODULE_STRATEGY: normal

  GIT_SUBMODULE_STRATEGY: recursive



before_script:

- if [ -d "/srv/userscripts" ]; then cp -R userscripts/* /srv/userscripts ; fi

.gitmodules

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

	path = extern/UnifiedNlp

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

	branch = master

	branch = dev

[submodule "extern/GmsApi"]

	path = extern/GmsApi

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

	branch = master

	branch = dev

[submodule "extern/Wearable"]

	path = extern/Wearable

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

	branch = master

	branch = dev

[submodule "extern/GmsLib"]

	path = extern/GmsLib

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

	bramch = master

	branch = dev

[submodule "extern/RemoteDroidGuard"]

	path = extern/RemoteDroidGuard

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

	branch = master
 
	branch = dev

RemoteDroidGuard @ 0c5c944a

Compare 821d6319 to 0c5c944a
Original line number Diff line number Diff line 
Subproject commit 821d63193a57a9d60892712a29c5e39211bb60a3
 
Subproject commit 0c5c944a54962a4c60cffa44785a36d7251df635