aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAutechre2020-12-25 17:18:30 +0100
committerGitHub2020-12-25 17:18:30 +0100
commitc3f224eb9afcd1964b0715a6b1563546c1c58463 (patch)
treee69551415651b93b191141baa4df85bee88f32f0
parent894fd7ddaa3c621413dbc6704840a7cc13d15a9d (diff)
parent8f22e92b09479ca19727a68ee121d45ed3c5d31a (diff)
downloadsnes9x2005-c3f224eb9afcd1964b0715a6b1563546c1c58463.tar.gz
snes9x2005-c3f224eb9afcd1964b0715a6b1563546c1c58463.tar.bz2
snes9x2005-c3f224eb9afcd1964b0715a6b1563546c1c58463.zip
Merge pull request #86 from jdgleaver/gitlab-cleanup
(.gitlab-ci.yml) Remove redundant android core defintion
-rw-r--r--.gitlab-ci.yml13
1 files changed, 4 insertions, 9 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6380f74..df23a5d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,11 +16,6 @@
CORENAME: snes9x2005_plus
USE_BLARGG_APU: 1
-.core-defs-plus-android:
- extends: .core-defs-plus
- variables:
- PLATFORM_ARGS: APP_ABI=$ANDROID_ABI USE_BLARGG_APU=1
-
# Inclusion templates, required for the build to work
include:
################################## DESKTOPS ################################
@@ -187,25 +182,25 @@ libretro-build-osx-x64-plus:
android-armeabi-v7a-plus:
extends:
- .libretro-android-jni-armeabi-v7a
- - .core-defs-plus-android
+ - .core-defs-plus
# Android ARMv8a
android-arm64-v8a-plus:
extends:
- .libretro-android-jni-arm64-v8a
- - .core-defs-plus-android
+ - .core-defs-plus
# Android 64-bit x86
android-x86_64-plus:
extends:
- .libretro-android-jni-x86_64
- - .core-defs-plus-android
+ - .core-defs-plus
# Android 32-bit x86
android-x86-plus:
extends:
- .libretro-android-jni-x86
- - .core-defs-plus-android
+ - .core-defs-plus
################################### CONSOLES #################################
# PlayStation Portable