diff options
| -rw-r--r-- | androidmk/cmd/androidmk/androidmk_test.go | 39 | ||||
| -rw-r--r-- | bpfix/bpfix/bpfix.go | 4 |
2 files changed, 41 insertions, 2 deletions
diff --git a/androidmk/cmd/androidmk/androidmk_test.go b/androidmk/cmd/androidmk/androidmk_test.go index 88c5304ea..3ec5f2e01 100644 --- a/androidmk/cmd/androidmk/androidmk_test.go +++ b/androidmk/cmd/androidmk/androidmk_test.go @@ -1119,6 +1119,45 @@ prebuilt_usr_share_host { `, }, { + desc: "prebuilt_font", + in: ` +include $(CLEAR_VARS) +LOCAL_MODULE := font.ttf +LOCAL_SRC_FILES := $(LOCAL_MODULE) +LOCAL_MODULE_CLASS := ETC +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_PATH := $(TARGET_OUT)/fonts +include $(BUILD_PREBUILT) +`, + expected: ` +prebuilt_font { + name: "font.ttf", + src: "font.ttf", + +} +`, + }, + { + desc: "prebuilt_font", + in: ` +include $(CLEAR_VARS) +LOCAL_MODULE := font.ttf +LOCAL_SRC_FILES := $(LOCAL_MODULE) +LOCAL_MODULE_CLASS := ETC +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/fonts +include $(BUILD_PREBUILT) +`, + expected: ` +prebuilt_font { + name: "font.ttf", + src: "font.ttf", + product_specific: true, + +} +`, + }, + { desc: "prebuilt_usr_share_host subdir_bar", in: ` include $(CLEAR_VARS) diff --git a/bpfix/bpfix/bpfix.go b/bpfix/bpfix/bpfix.go index f217da6aa..c89819651 100644 --- a/bpfix/bpfix/bpfix.go +++ b/bpfix/bpfix/bpfix.go @@ -501,9 +501,9 @@ func (f etcPrebuiltModuleUpdate) update(m *parser.Module, path string) bool { var localModuleUpdate = map[string][]etcPrebuiltModuleUpdate{ "HOST_OUT": {{prefix: "/etc", modType: "prebuilt_etc_host"}, {prefix: "/usr/share", modType: "prebuilt_usr_share_host"}}, "PRODUCT_OUT": {{prefix: "/system/etc"}, {prefix: "/vendor/etc", flags: []string{"proprietary"}}}, - "TARGET_OUT": {{prefix: "/etc"}, {prefix: "/usr/share", modType: "prebuilt_usr_share"}}, + "TARGET_OUT": {{prefix: "/etc"}, {prefix: "/usr/share", modType: "prebuilt_usr_share"}, {prefix: "/fonts", modType: "prebuilt_font"}}, "TARGET_OUT_ETC": {{prefix: ""}}, - "TARGET_OUT_PRODUCT": {{prefix: "/etc", flags: []string{"product_specific"}}}, + "TARGET_OUT_PRODUCT": {{prefix: "/etc", flags: []string{"product_specific"}}, {prefix: "/fonts", modType: "prebuilt_font", flags: []string{"product_specific"}}}, "TARGET_OUT_PRODUCT_ETC": {{prefix: "", flags: []string{"product_specific"}}}, "TARGET_OUT_ODM": {{prefix: "/etc", flags: []string{"device_specific"}}}, "TARGET_OUT_PRODUCT_SERVICES": {{prefix: "/etc", flags: []string{"product_services_specific"}}}, |