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

Add vintf_fragments.

Browse Source 
Bug: 66917623
Test: fragments are loaded in the right place
Test: boot device which is depending on fragments
Test: androidmk file which uses LOCAL_VINTF_FRAGMENTS properly
    converted
Change-Id: I366b731cf8d5ecf51851866f441ff1c517da75cf
This commit is contained in:
Steven Moreland
2018-04-04 15:42:19 -07:00
parent bc30a77591
commit 57a23d2f20
3 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
android/androidmk.go
View File

@@ -227,6 +227,9 @@ func translateAndroidMkModule(ctx SingletonContext, w io.Writer, mod blueprint.M
if len(amod.commonProperties.Init_rc) > 0 { if len(amod.commonProperties.Init_rc) > 0 {
fmt.Fprintln(&data.preamble, "LOCAL_INIT_RC := ", strings.Join(amod.commonProperties.Init_rc, " ")) fmt.Fprintln(&data.preamble, "LOCAL_INIT_RC := ", strings.Join(amod.commonProperties.Init_rc, " "))
} }
if len(amod.commonProperties.Vintf_fragments) > 0 {
fmt.Fprintln(&data.preamble, "LOCAL_VINTF_FRAGMENTS := ", strings.Join(amod.commonProperties.Vintf_fragments, " "))
}
if Bool(amod.commonProperties.Proprietary) { if Bool(amod.commonProperties.Proprietary) {
fmt.Fprintln(&data.preamble, "LOCAL_PROPRIETARY_MODULE := true") fmt.Fprintln(&data.preamble, "LOCAL_PROPRIETARY_MODULE := true")
} }

3
android/module.go
View File

@@ -242,6 +242,9 @@ type commonProperties struct {
// init.rc files to be installed if this module is installed // init.rc files to be installed if this module is installed
Init_rc []string Init_rc []string
// VINTF manifest fragments to be installed if this module is installed
Vintf_fragments []string
// names of other modules to install if this module is installed // names of other modules to install if this module is installed
Required []string `android:"arch_variant"` Required []string `android:"arch_variant"`

1
androidmk/cmd/androidmk/android.go
View File

@@ -121,6 +121,7 @@ func init() {
"LOCAL_EXPORT_SHARED_LIBRARY_HEADERS": "export_shared_lib_headers", "LOCAL_EXPORT_SHARED_LIBRARY_HEADERS": "export_shared_lib_headers",
"LOCAL_EXPORT_STATIC_LIBRARY_HEADERS": "export_static_lib_headers", "LOCAL_EXPORT_STATIC_LIBRARY_HEADERS": "export_static_lib_headers",
"LOCAL_INIT_RC": "init_rc", "LOCAL_INIT_RC": "init_rc",
"LOCAL_VINTF_FRAGMENTS": "vintf_fragments",
"LOCAL_TIDY_FLAGS": "tidy_flags", "LOCAL_TIDY_FLAGS": "tidy_flags",
// TODO: This is comma-separated, not space-separated // TODO: This is comma-separated, not space-separated
"LOCAL_TIDY_CHECKS": "tidy_checks", "LOCAL_TIDY_CHECKS": "tidy_checks",