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

Commit 0c4f71cd authored Apr 06, 2021 by Liz Kammer

Support paths for init_rc from Soong.

The property init_rc accepts paths and references to other modules;
however, none of that is passed onto make, resulting in errors if a
non-local path is used.

Test: m
Bug: 184567830
Change-Id: Idbbf9de66c5182784d055e1cd64bcef34a7dbd79

parent 440b2340

android/androidmk.go

+1 −1

Original line number	Diff line number	Diff line
		@@ -546,7 +546,7 @@ func (a *AndroidMkEntries) fillInEntries(ctx fillInEntriesContext, mod blueprint
		}

		if !amod.InRamdisk() && !amod.InVendorRamdisk() {
		a.AddStrings("LOCAL_INIT_RC", amod.commonProperties.Init_rc...)
		a.AddPaths("LOCAL_FULL_INIT_RC", amod.initRcPaths)
		}
		a.AddStrings("LOCAL_VINTF_FRAGMENTS", amod.commonProperties.Vintf_fragments...)
		a.SetBoolIfTrue("LOCAL_PROPRIETARY_MODULE", Bool(amod.commonProperties.Proprietary))

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_INIT_RC", "LOCAL_VINTF_FRAGMENTS",
		"LOCAL_FULL_INIT_RC", "LOCAL_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_INIT_RC", "LOCAL_VINTF_FRAGMENTS",
		"LOCAL_FULL_INIT_RC", "LOCAL_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
		@@ -2745,7 +2745,7 @@ func TestAndroidMkWritesCommonProperties(t *testing.T) {
		data.Custom(&builder, name, prefix, "", data)
		androidMk := builder.String()
		ensureContains(t, androidMk, "LOCAL_VINTF_FRAGMENTS := fragment.xml\n")
		ensureContains(t, androidMk, "LOCAL_INIT_RC := init.rc\n")
		ensureContains(t, androidMk, "LOCAL_FULL_INIT_RC := init.rc\n")
		}

		func TestStaticLinking(t *testing.T) {