Move font modules to undere a phony modules

Bug: 331320660
Test: m
Change-Id: Ib69dd609a2b8f4a081abec50eb5755b469253949

1 files changed, 215 insertions, 208 deletions

diff --git a/system_image/Android.bp b/system_image/Android.bp
index cf9285779..a28047191 100644
--- a/system_image/Android.bp
+++ b/system_image/Android.bp
@@ -62,6 +62,220 @@ android_symlinks = [
     },
 ]
 
+phony {
+    name: "fonts",
+    required: [
+        "AndroidClock.ttf",
+        "CarroisGothicSC-Regular.ttf",
+        "ComingSoon.ttf",
+        "CutiveMono.ttf",
+        "DancingScript-Regular.ttf",
+        "DroidSansMono.ttf",
+        "NotoColorEmoji.ttf",
+        "NotoColorEmojiFlags.ttf",
+        "NotoColorEmojiLegacy.ttf",
+        "NotoNaskhArabic-Bold.ttf",
+        "NotoNaskhArabic-Regular.ttf",
+        "NotoNaskhArabicUI-Bold.ttf",
+        "NotoNaskhArabicUI-Regular.ttf",
+        "NotoSansAdlam-VF.ttf",
+        "NotoSansAhom-Regular.otf",
+        "NotoSansAnatolianHieroglyphs-Regular.otf",
+        "NotoSansArmenian-VF.ttf",
+        "NotoSansAvestan-Regular.ttf",
+        "NotoSansBalinese-Regular.ttf",
+        "NotoSansBamum-Regular.ttf",
+        "NotoSansBassaVah-Regular.otf",
+        "NotoSansBatak-Regular.ttf",
+        "NotoSansBengali-VF.ttf",
+        "NotoSansBengaliUI-VF.ttf",
+        "NotoSansBhaiksuki-Regular.otf",
+        "NotoSansBrahmi-Regular.ttf",
+        "NotoSansBuginese-Regular.ttf",
+        "NotoSansBuhid-Regular.ttf",
+        "NotoSansCJK-Regular.ttc",
+        "NotoSansCanadianAboriginal-Regular.ttf",
+        "NotoSansCarian-Regular.ttf",
+        "NotoSansChakma-Regular.otf",
+        "NotoSansCham-Bold.ttf",
+        "NotoSansCham-Regular.ttf",
+        "NotoSansCherokee-Regular.ttf",
+        "NotoSansCoptic-Regular.ttf",
+        "NotoSansCuneiform-Regular.ttf",
+        "NotoSansCypriot-Regular.ttf",
+        "NotoSansDeseret-Regular.ttf",
+        "NotoSansDevanagari-VF.ttf",
+        "NotoSansDevanagariUI-VF.ttf",
+        "NotoSansEgyptianHieroglyphs-Regular.ttf",
+        "NotoSansElbasan-Regular.otf",
+        "NotoSansEthiopic-VF.ttf",
+        "NotoSansGeorgian-VF.ttf",
+        "NotoSansGlagolitic-Regular.ttf",
+        "NotoSansGothic-Regular.ttf",
+        "NotoSansGrantha-Regular.ttf",
+        "NotoSansGujarati-Bold.ttf",
+        "NotoSansGujarati-Regular.ttf",
+        "NotoSansGujaratiUI-Bold.ttf",
+        "NotoSansGujaratiUI-Regular.ttf",
+        "NotoSansGunjalaGondi-Regular.otf",
+        "NotoSansGurmukhi-VF.ttf",
+        "NotoSansGurmukhiUI-VF.ttf",
+        "NotoSansHanifiRohingya-Regular.otf",
+        "NotoSansHanunoo-Regular.ttf",
+        "NotoSansHatran-Regular.otf",
+        "NotoSansHebrew-Bold.ttf",
+        "NotoSansHebrew-Regular.ttf",
+        "NotoSansImperialAramaic-Regular.ttf",
+        "NotoSansInscriptionalPahlavi-Regular.ttf",
+        "NotoSansInscriptionalParthian-Regular.ttf",
+        "NotoSansJavanese-Regular.otf",
+        "NotoSansKaithi-Regular.ttf",
+        "NotoSansKannada-VF.ttf",
+        "NotoSansKannadaUI-VF.ttf",
+        "NotoSansKayahLi-Regular.ttf",
+        "NotoSansKharoshthi-Regular.ttf",
+        "NotoSansKhmer-VF.ttf",
+        "NotoSansKhmerUI-Bold.ttf",
+        "NotoSansKhmerUI-Regular.ttf",
+        "NotoSansKhojki-Regular.otf",
+        "NotoSansLao-Bold.ttf",
+        "NotoSansLao-Regular.ttf",
+        "NotoSansLaoUI-Bold.ttf",
+        "NotoSansLaoUI-Regular.ttf",
+        "NotoSansLepcha-Regular.ttf",
+        "NotoSansLimbu-Regular.ttf",
+        "NotoSansLinearA-Regular.otf",
+        "NotoSansLinearB-Regular.ttf",
+        "NotoSansLisu-Regular.ttf",
+        "NotoSansLycian-Regular.ttf",
+        "NotoSansLydian-Regular.ttf",
+        "NotoSansMalayalam-VF.ttf",
+        "NotoSansMalayalamUI-VF.ttf",
+        "NotoSansMandaic-Regular.ttf",
+        "NotoSansManichaean-Regular.otf",
+        "NotoSansMarchen-Regular.otf",
+        "NotoSansMasaramGondi-Regular.otf",
+        "NotoSansMedefaidrin-VF.ttf",
+        "NotoSansMeeteiMayek-Regular.ttf",
+        "NotoSansMeroitic-Regular.otf",
+        "NotoSansMiao-Regular.otf",
+        "NotoSansModi-Regular.ttf",
+        "NotoSansMongolian-Regular.ttf",
+        "NotoSansMro-Regular.otf",
+        "NotoSansMultani-Regular.otf",
+        "NotoSansMyanmar-Bold.otf",
+        "NotoSansMyanmar-Medium.otf",
+        "NotoSansMyanmar-Regular.otf",
+        "NotoSansMyanmarUI-Bold.otf",
+        "NotoSansMyanmarUI-Medium.otf",
+        "NotoSansMyanmarUI-Regular.otf",
+        "NotoSansNKo-Regular.ttf",
+        "NotoSansNabataean-Regular.otf",
+        "NotoSansNewTaiLue-Regular.ttf",
+        "NotoSansNewa-Regular.otf",
+        "NotoSansOgham-Regular.ttf",
+        "NotoSansOlChiki-Regular.ttf",
+        "NotoSansOldItalic-Regular.ttf",
+        "NotoSansOldNorthArabian-Regular.otf",
+        "NotoSansOldPermic-Regular.otf",
+        "NotoSansOldPersian-Regular.ttf",
+        "NotoSansOldSouthArabian-Regular.ttf",
+        "NotoSansOldTurkic-Regular.ttf",
+        "NotoSansOriya-Bold.ttf",
+        "NotoSansOriya-Regular.ttf",
+        "NotoSansOriyaUI-Bold.ttf",
+        "NotoSansOriyaUI-Regular.ttf",
+        "NotoSansOsage-Regular.ttf",
+        "NotoSansOsmanya-Regular.ttf",
+        "NotoSansPahawhHmong-Regular.otf",
+        "NotoSansPalmyrene-Regular.otf",
+        "NotoSansPauCinHau-Regular.otf",
+        "NotoSansPhagsPa-Regular.ttf",
+        "NotoSansPhoenician-Regular.ttf",
+        "NotoSansRejang-Regular.ttf",
+        "NotoSansRunic-Regular.ttf",
+        "NotoSansSamaritan-Regular.ttf",
+        "NotoSansSaurashtra-Regular.ttf",
+        "NotoSansSharada-Regular.otf",
+        "NotoSansShavian-Regular.ttf",
+        "NotoSansSinhala-VF.ttf",
+        "NotoSansSinhalaUI-VF.ttf",
+        "NotoSansSoraSompeng-Regular.otf",
+        "NotoSansSoyombo-VF.ttf",
+        "NotoSansSundanese-Regular.ttf",
+        "NotoSansSylotiNagri-Regular.ttf",
+        "NotoSansSymbols-Regular-Subsetted.ttf",
+        "NotoSansSymbols-Regular-Subsetted2.ttf",
+        "NotoSansSyriacEastern-Regular.ttf",
+        "NotoSansSyriacEstrangela-Regular.ttf",
+        "NotoSansSyriacWestern-Regular.ttf",
+        "NotoSansTagalog-Regular.ttf",
+        "NotoSansTagbanwa-Regular.ttf",
+        "NotoSansTaiLe-Regular.ttf",
+        "NotoSansTaiTham-Regular.ttf",
+        "NotoSansTaiViet-Regular.ttf",
+        "NotoSansTakri-VF.ttf",
+        "NotoSansTamil-VF.ttf",
+        "NotoSansTamilUI-VF.ttf",
+        "NotoSansTelugu-VF.ttf",
+        "NotoSansTeluguUI-VF.ttf",
+        "NotoSansThaana-Bold.ttf",
+        "NotoSansThaana-Regular.ttf",
+        "NotoSansThai-Bold.ttf",
+        "NotoSansThai-Regular.ttf",
+        "NotoSansThaiUI-Bold.ttf",
+        "NotoSansThaiUI-Regular.ttf",
+        "NotoSansTifinagh-Regular.otf",
+        "NotoSansUgaritic-Regular.ttf",
+        "NotoSansVai-Regular.ttf",
+        "NotoSansWancho-Regular.otf",
+        "NotoSansWarangCiti-Regular.otf",
+        "NotoSansYi-Regular.ttf",
+        "NotoSerif-Bold.ttf",
+        "NotoSerif-BoldItalic.ttf",
+        "NotoSerif-Italic.ttf",
+        "NotoSerif-Regular.ttf",
+        "NotoSerifArmenian-VF.ttf",
+        "NotoSerifBengali-VF.ttf",
+        "NotoSerifCJK-Regular.ttc",
+        "NotoSerifDevanagari-VF.ttf",
+        "NotoSerifDogra-Regular.ttf",
+        "NotoSerifEthiopic-VF.ttf",
+        "NotoSerifGeorgian-VF.ttf",
+        "NotoSerifGujarati-VF.ttf",
+        "NotoSerifGurmukhi-VF.ttf",
+        "NotoSerifHebrew-Bold.ttf",
+        "NotoSerifHebrew-Regular.ttf",
+        "NotoSerifKannada-VF.ttf",
+        "NotoSerifKhmer-Bold.otf",
+        "NotoSerifKhmer-Regular.otf",
+        "NotoSerifLao-Bold.ttf",
+        "NotoSerifLao-Regular.ttf",
+        "NotoSerifMalayalam-VF.ttf",
+        "NotoSerifMyanmar-Bold.otf",
+        "NotoSerifMyanmar-Regular.otf",
+        "NotoSerifNyiakengPuachueHmong-VF.ttf",
+        "NotoSerifSinhala-VF.ttf",
+        "NotoSerifTamil-VF.ttf",
+        "NotoSerifTelugu-VF.ttf",
+        "NotoSerifThai-Bold.ttf",
+        "NotoSerifThai-Regular.ttf",
+        "NotoSerifTibetan-VF.ttf",
+        "NotoSerifYezidi-VF.ttf",
+        "Roboto-Regular.ttf",
+        "RobotoFlex-Regular.ttf",
+        "RobotoStatic-Regular.ttf",
+        "SourceSansPro-Bold.ttf",
+        "SourceSansPro-BoldItalic.ttf",
+        "SourceSansPro-Italic.ttf",
+        "SourceSansPro-Regular.ttf",
+        "SourceSansPro-SemiBold.ttf",
+        "SourceSansPro-SemiBoldItalic.ttf",
+        "font_fallback.xml",
+        "fonts.xml",
+    ],
+}
+
 android_system_image {
     name: "aosp_cf_system_x86_64",
     use_avb: true,
@@ -119,7 +333,6 @@ android_system_image {
         "android.hidl.safe_union@1.0",
         "android.media.audio.common.types-V3-ndk",
         "android.system.suspend-service",
-        "AndroidClock.ttf",
         "apexd",
         "app_process",
         "appops",
@@ -142,17 +355,13 @@ android_system_image {
         "bugreportz",
         "cacerts",
         "cameraserver",
-        "CarroisGothicSC-Regular.ttf",
         "cgroups.json",
         "checkpoint_gc",
         "cmd",
-        "ComingSoon.ttf",
         "content",
         "cppreopts.sh",
         "credstore",
-        "CutiveMono.ttf",
         "cuttlefish_sensor_injection",
-        "DancingScript-Regular.ttf",
         "debuggerd",
         "device_config",
         "dirty-image-objects",
@@ -162,7 +371,6 @@ android_system_image {
         "dmesgd",
         "dnsmasq",
         "dpm",
-        "DroidSansMono.ttf",
         "dump.erofs",
         "dumpstate",
         "dumpsys",
@@ -173,8 +381,6 @@ android_system_image {
         "extra_free_kbytes",
         "fastbootd",
         "flags_health_check",
-        "font_fallback.xml",
-        "fonts.xml",
         "framework-audio_effects.xml",
         "framework-sysconfig.xml",
         "fsck_msdos",
@@ -437,197 +643,6 @@ android_system_image {
         "ndc",
         "netd",
         "netutils-wrapper-1.0",
-        "NotoColorEmoji.ttf",
-        "NotoColorEmojiFlags.ttf",
-        "NotoColorEmojiLegacy.ttf",
-        "NotoNaskhArabic-Bold.ttf",
-        "NotoNaskhArabic-Regular.ttf",
-        "NotoNaskhArabicUI-Bold.ttf",
-        "NotoNaskhArabicUI-Regular.ttf",
-        "NotoSansAdlam-VF.ttf",
-        "NotoSansAhom-Regular.otf",
-        "NotoSansAnatolianHieroglyphs-Regular.otf",
-        "NotoSansArmenian-VF.ttf",
-        "NotoSansAvestan-Regular.ttf",
-        "NotoSansBalinese-Regular.ttf",
-        "NotoSansBamum-Regular.ttf",
-        "NotoSansBassaVah-Regular.otf",
-        "NotoSansBatak-Regular.ttf",
-        "NotoSansBengali-VF.ttf",
-        "NotoSansBengaliUI-VF.ttf",
-        "NotoSansBhaiksuki-Regular.otf",
-        "NotoSansBrahmi-Regular.ttf",
-        "NotoSansBuginese-Regular.ttf",
-        "NotoSansBuhid-Regular.ttf",
-        "NotoSansCanadianAboriginal-Regular.ttf",
-        "NotoSansCarian-Regular.ttf",
-        "NotoSansChakma-Regular.otf",
-        "NotoSansCham-Bold.ttf",
-        "NotoSansCham-Regular.ttf",
-        "NotoSansCherokee-Regular.ttf",
-        "NotoSansCJK-Regular.ttc",
-        "NotoSansCoptic-Regular.ttf",
-        "NotoSansCuneiform-Regular.ttf",
-        "NotoSansCypriot-Regular.ttf",
-        "NotoSansDeseret-Regular.ttf",
-        "NotoSansDevanagari-VF.ttf",
-        "NotoSansDevanagariUI-VF.ttf",
-        "NotoSansEgyptianHieroglyphs-Regular.ttf",
-        "NotoSansElbasan-Regular.otf",
-        "NotoSansEthiopic-VF.ttf",
-        "NotoSansGeorgian-VF.ttf",
-        "NotoSansGlagolitic-Regular.ttf",
-        "NotoSansGothic-Regular.ttf",
-        "NotoSansGrantha-Regular.ttf",
-        "NotoSansGujarati-Bold.ttf",
-        "NotoSansGujarati-Regular.ttf",
-        "NotoSansGujaratiUI-Bold.ttf",
-        "NotoSansGujaratiUI-Regular.ttf",
-        "NotoSansGunjalaGondi-Regular.otf",
-        "NotoSansGurmukhi-VF.ttf",
-        "NotoSansGurmukhiUI-VF.ttf",
-        "NotoSansHanifiRohingya-Regular.otf",
-        "NotoSansHanunoo-Regular.ttf",
-        "NotoSansHatran-Regular.otf",
-        "NotoSansHebrew-Bold.ttf",
-        "NotoSansHebrew-Regular.ttf",
-        "NotoSansImperialAramaic-Regular.ttf",
-        "NotoSansInscriptionalPahlavi-Regular.ttf",
-        "NotoSansInscriptionalParthian-Regular.ttf",
-        "NotoSansJavanese-Regular.otf",
-        "NotoSansKaithi-Regular.ttf",
-        "NotoSansKannada-VF.ttf",
-        "NotoSansKannadaUI-VF.ttf",
-        "NotoSansKayahLi-Regular.ttf",
-        "NotoSansKharoshthi-Regular.ttf",
-        "NotoSansKhmer-VF.ttf",
-        "NotoSansKhmerUI-Bold.ttf",
-        "NotoSansKhmerUI-Regular.ttf",
-        "NotoSansKhojki-Regular.otf",
-        "NotoSansLao-Bold.ttf",
-        "NotoSansLao-Regular.ttf",
-        "NotoSansLaoUI-Bold.ttf",
-        "NotoSansLaoUI-Regular.ttf",
-        "NotoSansLepcha-Regular.ttf",
-        "NotoSansLimbu-Regular.ttf",
-        "NotoSansLinearA-Regular.otf",
-        "NotoSansLinearB-Regular.ttf",
-        "NotoSansLisu-Regular.ttf",
-        "NotoSansLycian-Regular.ttf",
-        "NotoSansLydian-Regular.ttf",
-        "NotoSansMalayalam-VF.ttf",
-        "NotoSansMalayalamUI-VF.ttf",
-        "NotoSansMandaic-Regular.ttf",
-        "NotoSansManichaean-Regular.otf",
-        "NotoSansMarchen-Regular.otf",
-        "NotoSansMasaramGondi-Regular.otf",
-        "NotoSansMedefaidrin-VF.ttf",
-        "NotoSansMeeteiMayek-Regular.ttf",
-        "NotoSansMeroitic-Regular.otf",
-        "NotoSansMiao-Regular.otf",
-        "NotoSansModi-Regular.ttf",
-        "NotoSansMongolian-Regular.ttf",
-        "NotoSansMro-Regular.otf",
-        "NotoSansMultani-Regular.otf",
-        "NotoSansMyanmar-Bold.otf",
-        "NotoSansMyanmar-Medium.otf",
-        "NotoSansMyanmar-Regular.otf",
-        "NotoSansMyanmarUI-Bold.otf",
-        "NotoSansMyanmarUI-Medium.otf",
-        "NotoSansMyanmarUI-Regular.otf",
-        "NotoSansNabataean-Regular.otf",
-        "NotoSansNewa-Regular.otf",
-        "NotoSansNewTaiLue-Regular.ttf",
-        "NotoSansNKo-Regular.ttf",
-        "NotoSansOgham-Regular.ttf",
-        "NotoSansOlChiki-Regular.ttf",
-        "NotoSansOldItalic-Regular.ttf",
-        "NotoSansOldNorthArabian-Regular.otf",
-        "NotoSansOldPermic-Regular.otf",
-        "NotoSansOldPersian-Regular.ttf",
-        "NotoSansOldSouthArabian-Regular.ttf",
-        "NotoSansOldTurkic-Regular.ttf",
-        "NotoSansOriya-Bold.ttf",
-        "NotoSansOriya-Regular.ttf",
-        "NotoSansOriyaUI-Bold.ttf",
-        "NotoSansOriyaUI-Regular.ttf",
-        "NotoSansOsage-Regular.ttf",
-        "NotoSansOsmanya-Regular.ttf",
-        "NotoSansPahawhHmong-Regular.otf",
-        "NotoSansPalmyrene-Regular.otf",
-        "NotoSansPauCinHau-Regular.otf",
-        "NotoSansPhagsPa-Regular.ttf",
-        "NotoSansPhoenician-Regular.ttf",
-        "NotoSansRejang-Regular.ttf",
-        "NotoSansRunic-Regular.ttf",
-        "NotoSansSamaritan-Regular.ttf",
-        "NotoSansSaurashtra-Regular.ttf",
-        "NotoSansSharada-Regular.otf",
-        "NotoSansShavian-Regular.ttf",
-        "NotoSansSinhala-VF.ttf",
-        "NotoSansSinhalaUI-VF.ttf",
-        "NotoSansSoraSompeng-Regular.otf",
-        "NotoSansSoyombo-VF.ttf",
-        "NotoSansSundanese-Regular.ttf",
-        "NotoSansSylotiNagri-Regular.ttf",
-        "NotoSansSymbols-Regular-Subsetted.ttf",
-        "NotoSansSymbols-Regular-Subsetted2.ttf",
-        "NotoSansSyriacEastern-Regular.ttf",
-        "NotoSansSyriacEstrangela-Regular.ttf",
-        "NotoSansSyriacWestern-Regular.ttf",
-        "NotoSansTagalog-Regular.ttf",
-        "NotoSansTagbanwa-Regular.ttf",
-        "NotoSansTaiLe-Regular.ttf",
-        "NotoSansTaiTham-Regular.ttf",
-        "NotoSansTaiViet-Regular.ttf",
-        "NotoSansTakri-VF.ttf",
-        "NotoSansTamil-VF.ttf",
-        "NotoSansTamilUI-VF.ttf",
-        "NotoSansTelugu-VF.ttf",
-        "NotoSansTeluguUI-VF.ttf",
-        "NotoSansThaana-Bold.ttf",
-        "NotoSansThaana-Regular.ttf",
-        "NotoSansThai-Bold.ttf",
-        "NotoSansThai-Regular.ttf",
-        "NotoSansThaiUI-Bold.ttf",
-        "NotoSansThaiUI-Regular.ttf",
-        "NotoSansTifinagh-Regular.otf",
-        "NotoSansUgaritic-Regular.ttf",
-        "NotoSansVai-Regular.ttf",
-        "NotoSansWancho-Regular.otf",
-        "NotoSansWarangCiti-Regular.otf",
-        "NotoSansYi-Regular.ttf",
-        "NotoSerif-Bold.ttf",
-        "NotoSerif-BoldItalic.ttf",
-        "NotoSerif-Italic.ttf",
-        "NotoSerif-Regular.ttf",
-        "NotoSerifArmenian-VF.ttf",
-        "NotoSerifBengali-VF.ttf",
-        "NotoSerifCJK-Regular.ttc",
-        "NotoSerifDevanagari-VF.ttf",
-        "NotoSerifDogra-Regular.ttf",
-        "NotoSerifEthiopic-VF.ttf",
-        "NotoSerifGeorgian-VF.ttf",
-        "NotoSerifGujarati-VF.ttf",
-        "NotoSerifGurmukhi-VF.ttf",
-        "NotoSerifHebrew-Bold.ttf",
-        "NotoSerifHebrew-Regular.ttf",
-        "NotoSerifKannada-VF.ttf",
-        "NotoSerifKhmer-Bold.otf",
-        "NotoSerifKhmer-Regular.otf",
-        "NotoSerifLao-Bold.ttf",
-        "NotoSerifLao-Regular.ttf",
-        "NotoSerifMalayalam-VF.ttf",
-        "NotoSerifMyanmar-Bold.otf",
-        "NotoSerifMyanmar-Regular.otf",
-        "NotoSerifNyiakengPuachueHmong-VF.ttf",
-        "NotoSerifSinhala-VF.ttf",
-        "NotoSerifTamil-VF.ttf",
-        "NotoSerifTelugu-VF.ttf",
-        "NotoSerifThai-Bold.ttf",
-        "NotoSerifThai-Regular.ttf",
-        "NotoSerifTibetan-VF.ttf",
-        "NotoSerifYezidi-VF.ttf",
         "odsign",
         "otapreopt_chroot",
         "otapreopt_script",
@@ -658,9 +673,6 @@ android_system_image {
         "recovery-refresh",
         "requestsync",
         "resize2fs",
-        "Roboto-Regular.ttf",
-        "RobotoFlex-Regular.ttf",
-        "RobotoStatic-Regular.ttf",
         "rss_hwm_reset",
         "run-as",
         "sample_camera_extensions.xml",
@@ -682,12 +694,6 @@ android_system_image {
         "snapuserd_ramdisk",
         "snapuserd",
         "socket_vsock_proxy",
-        "SourceSansPro-Bold.ttf",
-        "SourceSansPro-BoldItalic.ttf",
-        "SourceSansPro-Italic.ttf",
-        "SourceSansPro-Regular.ttf",
-        "SourceSansPro-SemiBold.ttf",
-        "SourceSansPro-SemiBoldItalic.ttf",
         "storaged",
         "surfaceflinger",
         "suspend_blocker",
@@ -834,6 +840,7 @@ android_system_image {
                 "ext",
                 "ExternalStorageProvider",
                 "ExtShared",
+                "fonts",
                 "framework-graphics",
                 "framework-location",
                 "framework-minus-apex-install-dependencies",