diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d2c025e..72eebc0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -47,6 +47,24 @@ include:
   - project: 'libretro-infrastructure/ci-templates'
     file: '/webos-make.yml'
 
+
+  ################################## CELLULAR ################################
+  # Android
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/android-jni.yml'
+
+  # iOS
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/ios-arm64.yml'
+
+  # tvOS
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/tvos-arm64.yml'
+
+  #################################### MISC ##################################
+  # Emscripten
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/emscripten-static.yml'
 # Stages for building
 stages:
   - build-prepare
@@ -106,3 +124,47 @@ libretro-build-webos-armv7a:
   extends:
     - .libretro-webos-armv7a-make-platform-webos
     - .core-defs
+
+################################### CELLULAR #################################
+# Android ARMv7a
+android-armeabi-v7a:
+  extends:
+    - .libretro-android-jni-armeabi-v7a
+    - .core-defs
+
+# Android ARMv8a
+android-arm64-v8a:
+  extends:
+    - .libretro-android-jni-arm64-v8a
+    - .core-defs
+
+# Android 32-bit x86
+android-x86:
+  extends:
+    - .libretro-android-jni-x86
+    - .core-defs
+
+# Android 64-bit x86
+android-x86_64:
+  extends:
+    - .libretro-android-jni-x86_64
+    - .core-defs
+
+# iOS arm64
+libretro-build-ios-arm64:
+  extends:
+    - .libretro-ios-arm64-make-default
+    - .core-defs
+
+# tvOS arm64
+libretro-build-tvos-arm64:
+  extends:
+    - .libretro-tvos-arm64-make-default
+    - .core-defs
+
+##################################### MISC ###################################
+# Emscripten
+libretro-build-emscripten:
+  extends:
+    - .libretro-emscripten-static-retroarch-master
+    - .core-defs
diff --git a/jni/Android.mk b/jni/Android.mk
index 3875d26..b8ea4b5 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -3,7 +3,9 @@ LOCAL_PATH := $(call my-dir)
 CORE_DIR := $(LOCAL_PATH)/..
 
 GLES     := 1
-INCFLAGS :=
+#The NDK's libc++ has no <tr1/memory>; include/compat carries the same shim the
+#Apple and Emscripten builds use, and shared.hpp aliases std1 to it.
+INCFLAGS := -I$(CORE_DIR)/include/compat
 
 include $(CORE_DIR)/Makefile.common
 
diff --git a/shared.hpp b/shared.hpp
index 0a89b60..55ab54e 100644
--- a/shared.hpp
+++ b/shared.hpp
@@ -28,7 +28,7 @@
 #include <tr1/memory>
 #endif
 
-#if defined(__QNX__) || defined(IOS) || defined(OSX) || defined(EMSCRIPTEN)
+#if defined(__QNX__) || defined(IOS) || defined(OSX) || defined(EMSCRIPTEN) || defined(__EMSCRIPTEN__) || defined(ANDROID)
 namespace std1 = compat;
 #else
 namespace std1 = std::tr1;