Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d3104e8c authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Soong: Add mk2bp conversion for prebuilt_font."

parents 4c83b895 d1f45c89

androidmk/cmd/androidmk/androidmk_test.go

+39 −0
Original line number Diff line number Diff line
@@ -1116,6 +1116,45 @@ prebuilt_usr_share_host { 


	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,



}

`,

	},

	{

bpfix/bpfix/bpfix.go

+2 −2
Original line number Diff line number Diff line
@@ -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"}}},