commit 9aa54c202f3263edf10f782f51c4e86763ee0bb0
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Aug 28 08:41:04 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Aug 28 08:41:04 2024 +0000
tree dde89ae9338822d781655311cff0bce8f0c2b043
parent e201ccf8d0053c92a2235037125abd7c54814ad2
parent d10e9d78e8110d2b875e64c7ebb6ee612828d370

Merge "Use generated font_fallback XML" into main

data/fonts/Android.bp

diff --git a/data/fonts/Android.bp b/data/fonts/Android.bp
index cbaac21..4edf52b 100644
--- a/data/fonts/Android.bp
+++ b/data/fonts/Android.bp
@@ -71,16 +71,9 @@
     },
 }
 
-// TODO(nona): Change this to use generate_font_fallback to be able to generate XML from
-//             per family JSON config
-prebuilt_fonts_xml {
+prebuilt_etc {
     name: "font_fallback.xml",
-    src: "font_fallback.xml",
-    soong_config_variables: {
-        use_var_font: {
-            src: "font_fallback_cjkvf.xml",
-        },
-    },
+    src: ":generate_font_fallback",
 }
 
 /////////////////////////////////