Get back to building all variants (except go) on Android 9

build.sh

@@ -48,11 +48,6 @@ repo manifest -r > release/$rom_fp/manifest.xml
 bash "$originFolder"/list-patches.sh
 cp patches.zip release/$rom_fp/patches.zip
 
-if [ "$1" == "android-9.0" ];then
-buildVariant treble_arm64_avS-userdebug arm64-aonly-vanilla-su
-buildVariant treble_arm64_bvS-userdebug arm64-ab-vanilla-su
-buildVariant treble_arm_avS-userdebug arm-aonly-vanilla-su
-else
 buildVariant treble_arm64_avN-userdebug arm64-aonly-vanilla-nosu
 buildVariant treble_arm64_agS-userdebug arm64-aonly-gapps-su
 buildVariant treble_arm64_afS-userdebug arm64-aonly-floss-su
@@ -62,8 +57,7 @@ buildVariant treble_arm64_bgS-userdebug arm64-ab-gapps-su
 buildVariant treble_arm64_bfS-userdebug arm64-ab-floss-su
 
 buildVariant treble_arm_avN-userdebug arm-aonly-vanilla-nosu
-buildVariant treble_arm_aoS-userdebug arm-aonly-go-su
-fi
+[ "$1" != "android-9.0" ] && buildVariant treble_arm_aoS-userdebug arm-aonly-go-su
 
 if [ "$release" == true ];then
     (