From 074fef98d4a1c2b968b150e09bc45f5efdaa8b1d Mon Sep 17 00:00:00 2001 From: Jerome Gaillard Date: Mon, 28 Oct 2019 15:19:51 +0000 Subject: [PATCH] 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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/sdk_font.mk b/core/sdk_font.mk index 0259a9ce50..174292559f 100644 --- a/core/sdk_font.mk +++ b/core/sdk_font.mk @@ -19,9 +19,9 @@ SDK_FONT_TEMP := $(call intermediates-dir-for,PACKAGING,sdk-fonts,HOST,COMMON) # 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 $< $@