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

Commit bda284bb authored by Liz Kammer's avatar Liz Kammer Committed by Gerrit Code Review
Browse files

Merge "Support paths for init_rc from Soong."

parents 26bd783d 0c4f71cd

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
@@ -2756,7 +2756,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) {