diff options
| author | 2024-12-12 11:03:33 -0800 | |
|---|---|---|
| committer | 2024-12-12 11:03:33 -0800 | |
| commit | fa4e1695a6c636eacde1febce8d9fd4e9c610589 (patch) | |
| tree | bfed72e0f15a3839bb25721e571cbe94ca6310ab | |
| parent | 55304c6d674a5e3fed6f3d6843750f1c6c5d5412 (diff) | |
| parent | e451ed647f0ee3565f994ea4ad16fff0c3992db2 (diff) | |
Merge "Fix missing file errors when running with --soong-only" into main am: e451ed647f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3408300
Change-Id: Ifcf1ea84d37513820a2904d1da75e4a223311249
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | android/module_context.go | 6 | ||||
| -rw-r--r-- | apex/builder.go | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/android/module_context.go b/android/module_context.go index ae7b54f66..b097117d8 100644 --- a/android/module_context.go +++ b/android/module_context.go @@ -623,8 +623,10 @@ func (m *moduleContext) installFile(installPath InstallPath, name string, srcPat if m.requiresFullInstall() { deps = append(deps, InstallPaths(m.TransitiveInstallFiles.ToList())...) - deps = append(deps, m.installedInitRcPaths...) - deps = append(deps, m.installedVintfFragmentsPaths...) + if m.config.KatiEnabled() { + deps = append(deps, m.installedInitRcPaths...) + deps = append(deps, m.installedVintfFragmentsPaths...) + } var implicitDeps, orderOnlyDeps Paths diff --git a/apex/builder.go b/apex/builder.go index a3343c338..4c91dd0b2 100644 --- a/apex/builder.go +++ b/apex/builder.go @@ -544,7 +544,7 @@ func (a *apexBundle) buildApex(ctx android.ModuleContext) { imageDir := android.PathForModuleOut(ctx, "image"+suffix) - installSymbolFiles := (!ctx.Config().KatiEnabled() || a.ExportedToMake()) && a.installable() + installSymbolFiles := (ctx.Config().KatiEnabled() && a.ExportedToMake()) && a.installable() // set of dependency module:location mappings installMapSet := make(map[string]bool) |