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

Merge "Support paths for vintf_fragments from Soong."

Browse Source
This commit is contained in:
Treehugger Robot
2021-04-22 17:03:31 +00:00
committed by Gerrit Code Review
parent 0f28a51669 7b3dc8a259
commit 1552c7b178
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android/androidmk.go
View File

@@ -550,7 +550,9 @@ func (a *AndroidMkEntries) fillInEntries(ctx fillInEntriesContext, mod blueprint
if !amod.InRamdisk() && !amod.InVendorRamdisk() { if !amod.InRamdisk() && !amod.InVendorRamdisk() {
a.AddPaths("LOCAL_FULL_INIT_RC", amod.initRcPaths) 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)) a.SetBoolIfTrue("LOCAL_PROPRIETARY_MODULE", Bool(amod.commonProperties.Proprietary))
if Bool(amod.commonProperties.Vendor) || Bool(amod.commonProperties.Soc_specific) { if Bool(amod.commonProperties.Vendor) || Bool(amod.commonProperties.Soc_specific) {
a.SetString("LOCAL_VENDOR_MODULE", "true") a.SetString("LOCAL_VENDOR_MODULE", "true")

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_FULL_INIT_RC", "LOCAL_VINTF_FRAGMENTS", "LOCAL_FULL_INIT_RC", "LOCAL_FULL_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_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_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

@@ -2755,7 +2755,7 @@ func TestAndroidMkWritesCommonProperties(t *testing.T) {
var builder strings.Builder var builder strings.Builder
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_FULL_VINTF_FRAGMENTS := fragment.xml\n")
ensureContains(t, androidMk, "LOCAL_FULL_INIT_RC := init.rc\n") ensureContains(t, androidMk, "LOCAL_FULL_INIT_RC := init.rc\n")
} }