diff options
| -rw-r--r-- | cc/androidmk.go | 12 | ||||
| -rw-r--r-- | cc/vndk_prebuilt.go | 8 |
2 files changed, 20 insertions, 0 deletions
diff --git a/cc/androidmk.go b/cc/androidmk.go index 91eb88611..38269cb8f 100644 --- a/cc/androidmk.go +++ b/cc/androidmk.go @@ -487,9 +487,21 @@ func (c *vndkPrebuiltLibraryDecorator) AndroidMkEntries(ctx AndroidMkContext, en entries.ExtraEntries = append(entries.ExtraEntries, func(entries *android.AndroidMkEntries) { c.libraryDecorator.androidMkWriteExportedFlags(entries) + // Specifying stem is to pass check_elf_files when vendor modules link against vndk prebuilt. + // We can't use install path because VNDKs are not installed. Instead, Srcs is directly used. + _, file := filepath.Split(c.properties.Srcs[0]) + stem, suffix, ext := android.SplitFileExt(file) + entries.SetString("LOCAL_BUILT_MODULE_STEM", "$(LOCAL_MODULE)"+ext) + entries.SetString("LOCAL_MODULE_SUFFIX", suffix) + entries.SetString("LOCAL_MODULE_STEM", stem) + if c.tocFile.Valid() { entries.SetString("LOCAL_SOONG_TOC", c.tocFile.String()) } + + // VNDK libraries available to vendor are not installed because + // they are packaged in VNDK APEX and installed by APEX packages (apex/apex.go) + entries.SetBool("LOCAL_UNINSTALLABLE_MODULE", true) }) } diff --git a/cc/vndk_prebuilt.go b/cc/vndk_prebuilt.go index 82a7732aa..dddd5ac98 100644 --- a/cc/vndk_prebuilt.go +++ b/cc/vndk_prebuilt.go @@ -232,6 +232,14 @@ func vndkPrebuiltSharedLibrary() *Module { &prebuilt.properties, ) + android.AddLoadHook(module, func(ctx android.LoadHookContext) { + // empty BOARD_VNDK_VERSION implies that the device won't support + // system only OTA. In this case, VNDK snapshots aren't needed. + if ctx.DeviceConfig().VndkVersion() == "" { + ctx.Module().Disable() + } + }) + return module } |