diff options
| -rw-r--r-- | apex/androidmk.go | 1 | ||||
| -rw-r--r-- | apex/prebuilt.go | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/apex/androidmk.go b/apex/androidmk.go index f4690620c..b0c391846 100644 --- a/apex/androidmk.go +++ b/apex/androidmk.go @@ -287,6 +287,7 @@ func (a *apexBundle) androidMkForType() android.AndroidMkData { if a.installable() { fmt.Fprintln(w, "LOCAL_SOONG_INSTALLED_MODULE :=", a.installedFile.String()) fmt.Fprintln(w, "LOCAL_SOONG_INSTALL_PAIRS :=", a.outputFile.String()+":"+a.installedFile.String()) + fmt.Fprintln(w, "LOCAL_SOONG_INSTALL_SYMLINKS := ", strings.Join(a.compatSymlinks.Strings(), " ")) } // Because apex writes .mk with Custom(), we need to write manually some common properties diff --git a/apex/prebuilt.go b/apex/prebuilt.go index 3509e6cbe..f2e87c829 100644 --- a/apex/prebuilt.go +++ b/apex/prebuilt.go @@ -235,6 +235,7 @@ func (p *prebuiltCommon) AndroidMkEntries() []android.AndroidMkEntries { entries.SetString("LOCAL_MODULE_STEM", p.installFilename) entries.SetPath("LOCAL_SOONG_INSTALLED_MODULE", p.installedFile) entries.SetString("LOCAL_SOONG_INSTALL_PAIRS", p.outputApex.String()+":"+p.installedFile.String()) + entries.AddStrings("LOCAL_SOONG_INSTALL_SYMLINKS", p.compatSymlinks.Strings()...) entries.SetBoolIfTrue("LOCAL_UNINSTALLABLE_MODULE", !p.installable()) entries.AddStrings("LOCAL_OVERRIDES_MODULES", p.prebuiltCommonProperties.Overrides...) p.addRequiredModules(entries) |