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

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

Merge "Support paths for vintf_fragments from Soong."

parents 0f28a516 7b3dc8a2

android/androidmk.go

+3 −1
Original line number Diff line number Diff line
@@ -550,7 +550,9 @@ func (a *AndroidMkEntries) fillInEntries(ctx fillInEntriesContext, mod blueprint 
		if !amod.InRamdisk() && !amod.InVendorRamdisk() {

			a.AddPaths("LOCAL_FULL_INIT_RC", amod.initRcPaths)

		}

		a.AddStrings("LOCAL_VINTF_FRAGMENTS", amod.commonProperties.Vintf_fragments...)

		if len(amod.vintfFragmentsPaths) > 0 {

			a.AddPaths("LOCAL_FULL_VINTF_FRAGMENTS", amod.vintfFragmentsPaths)

		}

		a.SetBoolIfTrue("LOCAL_PROPRIETARY_MODULE", Bool(amod.commonProperties.Proprietary))

		if Bool(amod.commonProperties.Vendor) || Bool(amod.commonProperties.Soc_specific) {

			a.SetString("LOCAL_VENDOR_MODULE", "true")

apex/androidmk.go

+2 −2
Original line number Diff line number Diff line
@@ -284,7 +284,7 @@ func (a *apexBundle) androidMkForFiles(w io.Writer, apexBundleName, apexName, mo 
					// To install companion files (init_rc, vintf_fragments)

					// Copy some common properties of apexBundle to apex_manifest

					commonProperties := []string{

						"LOCAL_FULL_INIT_RC", "LOCAL_VINTF_FRAGMENTS",

						"LOCAL_FULL_INIT_RC", "LOCAL_FULL_VINTF_FRAGMENTS",

					}

					for _, name := range commonProperties {

						if value, ok := apexAndroidMkData.Entries.EntryMap[name]; ok {
@@ -394,7 +394,7 @@ func (a *apexBundle) androidMkForType() android.AndroidMkData { 
				// Because apex writes .mk with Custom(), we need to write manually some common properties

				// which are available via data.Entries

				commonProperties := []string{

					"LOCAL_FULL_INIT_RC", "LOCAL_VINTF_FRAGMENTS",

					"LOCAL_FULL_INIT_RC", "LOCAL_FULL_VINTF_FRAGMENTS",

					"LOCAL_PROPRIETARY_MODULE", "LOCAL_VENDOR_MODULE", "LOCAL_ODM_MODULE", "LOCAL_PRODUCT_MODULE", "LOCAL_SYSTEM_EXT_MODULE",

					"LOCAL_MODULE_OWNER",

				}

apex/apex_test.go

+1 −1
Original line number Diff line number Diff line
@@ -2755,7 +2755,7 @@ func TestAndroidMkWritesCommonProperties(t *testing.T) { 
	var builder strings.Builder

	data.Custom(&builder, name, prefix, "", data)

	androidMk := builder.String()

	ensureContains(t, androidMk, "LOCAL_VINTF_FRAGMENTS := fragment.xml\n")

	ensureContains(t, androidMk, "LOCAL_FULL_VINTF_FRAGMENTS := fragment.xml\n")

	ensureContains(t, androidMk, "LOCAL_FULL_INIT_RC := init.rc\n")

}