Rename a64 to arm32_binder64. add a64/gapps variant

Author: phhusson

build.sh

@@ -84,16 +84,20 @@ if [ "$1" = "android-11.0" ];then
 
     # ARM32_binder64 vanilla {ab, ab vndk lite}
 	buildVariant treble_a64_bvS-userdebug roar-a64-ab-vanilla
-    ( cd sas-creator; bash lite-adapter.sh 32; xz -c s.img -T0 > ../release/$rom_fp/system-roar-a64-ab-vndklite-vanilla.img.xz)
+    ( cd sas-creator; bash lite-adapter.sh 32; xz -c s.img -T0 > ../release/$rom_fp/system-roar-arm32_binder64-ab-vndklite-vanilla.img.xz)
 
     # ARM64 Gapps {ab, a-only, ab vndk lite}
 	buildVariant treble_arm64_bgS-userdebug roar-arm64-ab-gapps
     ( cd sas-creator; bash run.sh 64 ; xz -c s.img -T0 > ../release/$rom_fp/system-roar-arm64-aonly-gapps.img.xz)
     ( cd sas-creator; bash lite-adapter.sh 64; xz -c s.img -T0 > ../release/$rom_fp/system-roar-arm64-ab-vndklite-gapps.img.xz )
 
     # ARM32_binder64 go gapps {ab, ab vndk lite}
-	buildVariant treble_a64_boS-userdebug roar-a64-ab-gogapps
-    ( cd sas-creator; bash lite-adapter.sh 32; xz -c s.img -T0 > ../release/$rom_fp/system-roar-a64-ab-vndklite-gogapps.img.xz )
+	buildVariant treble_a64_boS-userdebug roar-arm32_binder64-ab-gogapps
+    ( cd sas-creator; bash lite-adapter.sh 32; xz -c s.img -T0 > ../release/$rom_fp/system-roar-arm32_binder64-ab-vndklite-gogapps.img.xz )
+
+    # ARM32_binder64 gapps {ab, ab vndk lite}
+	buildVariant treble_a64_bgS-userdebug roar-arm32_binder64-ab-gapps
+    ( cd sas-creator; bash lite-adapter.sh 32; xz -c s.img -T0 > ../release/$rom_fp/system-roar-arm32_binder64-ab-vndklite-gapps.img.xz )
 elif [ "$1" = "android-10.0" ];then
 	buildVariant treble_arm64_afS-userdebug quack-arm64-aonly-floss
 	buildVariant treble_arm64_avS-userdebug quack-arm64-aonly-vanilla