summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e40da8c)
raw | patch | inline | side by side (parent: e40da8c)
author | Patrice Arruda <patricearruda@google.com> | |
Thu, 16 May 2019 01:21:32 +0000 (18:21 -0700) | ||
committer | Patrice Arruda <patricearruda@google.com> | |
Thu, 16 May 2019 17:48:32 +0000 (10:48 -0700) |
There are a couple of makefiles that have etc with $(TARGET_OUT)/fonts
and $(TARGET_OUT_PRODUCT)/fonts as the local module path. Added the
conversion in androidmk for target.
bug: b/123403785
Test: Wrote and ran unit test cases, did a test conversion on
* platform/external/google-fonts/dancing-script/Android.mk
* internal/external/google-fonts/arbutus-fonts/Android.mk
Change-Id: Id67e10f80b32b27c5027cd274a7944801dad0880
and $(TARGET_OUT_PRODUCT)/fonts as the local module path. Added the
conversion in androidmk for target.
bug: b/123403785
Test: Wrote and ran unit test cases, did a test conversion on
* platform/external/google-fonts/dancing-script/Android.mk
* internal/external/google-fonts/arbutus-fonts/Android.mk
Change-Id: Id67e10f80b32b27c5027cd274a7944801dad0880
androidmk/cmd/androidmk/androidmk_test.go | patch | blob | history | |
bpfix/bpfix/bpfix.go | patch | blob | history |
index 88c5304ea55e0154b973fe481a01740865e3c542..3ec5f2e01c213f71c9d082c865cbed4757384197 100644 (file)
src: "foo.txt",
}
+`,
+ },
+ {
+ 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,
+
+}
`,
},
{
diff --git a/bpfix/bpfix/bpfix.go b/bpfix/bpfix/bpfix.go
index f217da6aa89335205d89be4ccf2146a3996c08c9..c89819651034f2002454c4b720387da4d1abba46 100644 (file)
--- a/bpfix/bpfix/bpfix.go
+++ b/bpfix/bpfix/bpfix.go
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"}}},