Change location of font XML files for layoutlib build
font_fallback.xml is now generated by the build, so layoutlib should get
the files from their build location instead of copying them from source.
Flag: NONE host-only change
Bug: 74062470
Test: build layoutlib
Change-Id: I2bcc8021705c487c0be1936ecb73545ec062f6d8
diff --git a/core/layoutlib_data.mk b/core/layoutlib_data.mk
index e420a00..40b5842 100644
--- a/core/layoutlib_data.mk
+++ b/core/layoutlib_data.mk
@@ -3,11 +3,10 @@
FONT_TEMP := $(call intermediates-dir-for,PACKAGING,fonts,HOST,COMMON)
# The font configuration files - system_fonts.xml, fallback_fonts.xml etc.
-font_config := $(sort $(wildcard frameworks/base/data/fonts/*.xml))
+font_config := $(filter $(TARGET_OUT)/etc/font%.xml, $(INTERNAL_SYSTEMIMAGE_FILES))
font_config := $(addprefix $(FONT_TEMP)/, $(notdir $(font_config)))
-$(font_config): $(FONT_TEMP)/%.xml: \
- frameworks/base/data/fonts/%.xml
+$(font_config): $(FONT_TEMP)/%: $(TARGET_OUT)/etc/%
$(hide) mkdir -p $(dir $@)
$(hide) cp -vf $< $@