StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Support paths for init_rc from Soong." am: bda284bb19

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1665439

Change-Id: Icedc8106dc6e94ff903508b85b9d080e202c4921
This commit is contained in:
Liz Kammer
2021-04-12 19:39:49 +00:00
committed by Automerger Merge Worker
parent 3f13b50d6f bda284bb19
commit 63f8d3c013
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android/androidmk.go
View File

@@ -546,7 +546,7 @@ func (a *AndroidMkEntries) fillInEntries(ctx fillInEntriesContext, mod blueprint
} }
if !amod.InRamdisk() && !amod.InVendorRamdisk() { 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.AddStrings("LOCAL_VINTF_FRAGMENTS", amod.commonProperties.Vintf_fragments...)
a.SetBoolIfTrue("LOCAL_PROPRIETARY_MODULE", Bool(amod.commonProperties.Proprietary)) a.SetBoolIfTrue("LOCAL_PROPRIETARY_MODULE", Bool(amod.commonProperties.Proprietary))

4
apex/androidmk.go
View File

@@ -284,7 +284,7 @@ func (a *apexBundle) androidMkForFiles(w io.Writer, apexBundleName, apexName, mo
// To install companion files (init_rc, vintf_fragments) // To install companion files (init_rc, vintf_fragments)
// Copy some common properties of apexBundle to apex_manifest // Copy some common properties of apexBundle to apex_manifest
commonProperties := []string{ commonProperties := []string{
"LOCAL_INIT_RC", "LOCAL_VINTF_FRAGMENTS", "LOCAL_FULL_INIT_RC", "LOCAL_VINTF_FRAGMENTS",
} }
for _, name := range commonProperties { for _, name := range commonProperties {
if value, ok := apexAndroidMkData.Entries.EntryMap[name]; ok { 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 // Because apex writes .mk with Custom(), we need to write manually some common properties
// which are available via data.Entries // which are available via data.Entries
commonProperties := []string{ 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_PROPRIETARY_MODULE", "LOCAL_VENDOR_MODULE", "LOCAL_ODM_MODULE", "LOCAL_PRODUCT_MODULE", "LOCAL_SYSTEM_EXT_MODULE",
"LOCAL_MODULE_OWNER", "LOCAL_MODULE_OWNER",
} }

2
apex/apex_test.go
View File

@@ -2756,7 +2756,7 @@ func TestAndroidMkWritesCommonProperties(t *testing.T) {
data.Custom(&builder, name, prefix, "", data) data.Custom(&builder, name, prefix, "", data)
androidMk := builder.String() androidMk := builder.String()
ensureContains(t, androidMk, "LOCAL_VINTF_FRAGMENTS := fragment.xml\n") 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) { func TestStaticLinking(t *testing.T) {