commit 074fef98d4a1c2b968b150e09bc45f5efdaa8b1d
author Jerome Gaillard <jgaillard@google.com> Mon Oct 28 15:19:51 2019 +0000
committer Jerome Gaillard <jgaillard@google.com> Wed Jan 29 18:26:32 2020 +0000
tree cf19d44d7fb147ebe5c92e2cecb0b01dcc8cf09b
parent 4fc1d0899c38dc4a136d12123284884a410d4c68

Move font xml files to "standard" directory

This will allow to load different fonts for standard and native versions
of layoutlib.

Exempt-From-Owner-Approval: layoutlib branch
Bug: 143073883
Test: N/A
Change-Id: If44fc587eac2c3543cdff3760e64df003f12bdf2
(cherry picked from commit a9c9c7410491c42733ab565ca75a8708d4a9b064)

core/sdk_font.mk

diff --git a/core/sdk_font.mk b/core/sdk_font.mk
index 0259a9c..1742925 100644
--- a/core/sdk_font.mk
+++ b/core/sdk_font.mk
@@ -19,9 +19,9 @@
 
 # The font configuration files - system_fonts.xml, fallback_fonts.xml etc.
 sdk_font_config := $(sort $(wildcard frameworks/base/data/fonts/*.xml))
-sdk_font_config :=  $(addprefix $(SDK_FONT_TEMP)/, $(notdir $(sdk_font_config)))
+sdk_font_config :=  $(addprefix $(SDK_FONT_TEMP)/standard/, $(notdir $(sdk_font_config)))
 
-$(sdk_font_config): $(SDK_FONT_TEMP)/%.xml: \
+$(sdk_font_config): $(SDK_FONT_TEMP)/standard/%.xml: \
 			frameworks/base/data/fonts/%.xml
 	$(hide) mkdir -p $(dir $@)
 	$(hide) cp -vf $< $@