Add YouTube Music, replace Play Music for SDK21+

scripts/inc.aromadata.sh

@@ -194,6 +194,7 @@ form(
       "WebViewGoogle",     "<b>Android System WebView</b>",       "Requires Android 5.1 or later, WebViewStub is installed on Android 7.0+ instead when Google Chrome is selected",                      "check",
       "Wellbeing",     "<b>Digital Wellbeing</b>",       "Requires Android 9.0 or later",                      "check",
       "YouTube",     "<b>YouTube</b>",       "",                      "check",
+      "YTMusic",     "<b>YouTube Music</b>",       "",                      "check",
       "Zhuyin",     "<b>Google Zhuyin Input</b>",       "",                      "check"
 );
 # Duplicate aromagapps.prop and rename it to gapps.prop - this is useful because the selections won't be erased by the complete installation (menu.prop selected ==2)
@@ -738,6 +739,12 @@ then
   appendvar("gapps", "YouTube\n");
 endif;
 
+if
+  prop("gapps.prop", "YTMusic")=="1"
+then
+  appendvar("gapps", "YTMusic\n");
+endif;
+
 if
   prop("gapps.prop", "Zhuyin")=="1"
 then

scripts/inc.buildtarget.sh

@@ -56,7 +56,6 @@ chrome
 drive
 keep
 movies
-music
 newsstand
 playgames
 talkback"
@@ -381,6 +380,7 @@ get_package_info(){
                                 packagegappsremove="product/overlay/WellbeingOverlay.apk vendor/overlay/WellbeingOverlay.apk"
                               fi;;
     youtube)                  packagetype="GApps"; packagename="com.google.android.youtube"; packagetarget="app/YouTube";;
+    ytmusic)                  packagetype="GApps"; packagename="com.google.android.apps.youtube.music"; packagetarget="app/YouTubeMusicPrebuilt";;
     zhuyin)                   packagetype="GApps"; packagename="com.google.android.apps.inputmethod.zhuyin"; packagetarget="app/GoogleZhuyinIME";;  # ZhuyinIME exists in some ROMs
 
     # TV GApps

scripts/inc.compatibility.sh

@@ -501,7 +501,10 @@ setupwizardtablet"
 }
 
 api21hack(){
-  if [ "$API" -ge "21" ]; then
+  if [ "$API" -le "21" ]; then
+    gappsfull="$gappsfull
+music"
+  else
     if [ "$API" -eq "21" ]; then
       gappscore="$gappscore
 gmssetup
@@ -516,6 +519,8 @@ wallpapers"
     gappsstock="$gappsstock
 androidauto
 contactsgoogle"
+    gappsfull="$gappsfull
+ytmusic"
     miniremove="$miniremove
 clockstock
 tagstock"