commit b3731e0db2b4ce553b8e9d4c25d154553b029210
author Wei Li <weiwli@google.com> Wed Oct 25 17:35:40 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Oct 25 17:35:40 2023 +0000
tree 9c63ea987cdb059e8db1631590f57143636c5c5d
parent c87fd674a85b15446aa1ef8e6f68116d52bb2409
parent ea9dab478c443e9659b2724d25d46231433047a9

Merge "Add key character maps to layoutlib dist files" into main

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index a253026..37dd0f6 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -7676,7 +7676,7 @@
 
 # -----------------------------------------------------------------
 # Extract platform fonts used in Layoutlib
-include $(BUILD_SYSTEM)/layoutlib_fonts.mk
+include $(BUILD_SYSTEM)/layoutlib_data.mk
 
 
 # -----------------------------------------------------------------

core/layoutlib_data.mk

diff --git a/core/layoutlib_fonts.mk b/core/layoutlib_data.mk
similarity index 86%
rename from core/layoutlib_fonts.mk
rename to core/layoutlib_data.mk
index e7b3a76..09e48f3 100644
--- a/core/layoutlib_fonts.mk
+++ b/core/layoutlib_data.mk
@@ -1,4 +1,4 @@
-# Fonts for layoutlib
+# Data files for layoutlib
 
 FONT_TEMP := $(call intermediates-dir-for,PACKAGING,fonts,HOST,COMMON)
 
@@ -21,13 +21,25 @@
 	$(hide) mkdir -p $(dir $@)
 	$(hide) cp -vf $< $@
 
-# List of all dependencies - all fonts and configuration files.
-FONT_FILES := $(fonts_device) $(font_config)
+KEYBOARD_TEMP := $(call intermediates-dir-for,PACKAGING,keyboards,HOST,COMMON)
+
+# The key character map files needed for supporting KeyEvent
+keyboards := $(sort $(wildcard frameworks/base/data/keyboards/*.kcm))
+keyboards := $(addprefix $(KEYBOARD_TEMP)/, $(notdir $(keyboards)))
+
+$(keyboards): $(KEYBOARD_TEMP)/%.kcm: frameworks/base/data/keyboards/%.kcm
+	$(hide) mkdir -p $(dir $@)
+	$(hide) cp -vf $< $@
+
+# List of all data files - font files, font configuration files, key character map files
+LAYOUTLIB_FILES := $(fonts_device) $(font_config) $(keyboards)
 
 .PHONY: layoutlib layoutlib-tests
-layoutlib layoutlib-tests: $(FONT_FILES)
+layoutlib layoutlib-tests: $(LAYOUTLIB_FILES)
 
-$(call dist-for-goals, layoutlib, $(foreach m,$(FONT_FILES), $(m):layoutlib_native/fonts/$(notdir $(m))))
+$(call dist-for-goals, layoutlib, $(foreach m,$(fonts_device), $(m):layoutlib_native/fonts/$(notdir $(m))))
+$(call dist-for-goals, layoutlib, $(foreach m,$(font_config), $(m):layoutlib_native/fonts/$(notdir $(m))))
+$(call dist-for-goals, layoutlib, $(foreach m,$(keyboards), $(m):layoutlib_native/keyboards/$(notdir $(m))))
 
 FONT_TEMP :=
 font_config :=