Revert "Use Unique lists instead of pointers in PackagingSpec."
This reverts commit db901f84d8fc7716d9fccfb09fdaca20750025fe.
Bug: 376489729
Test: builds
Flag: EXEMPT bugfix
Change-Id: Ia5dfcf7f4e3c70042001e60850e366934ab14df4
diff --git a/android/module_context.go b/android/module_context.go
index d71992d..9fa3a62 100644
--- a/android/module_context.go
+++ b/android/module_context.go
@@ -16,14 +16,13 @@
import (
"fmt"
+ "github.com/google/blueprint/depset"
"path"
"path/filepath"
"strings"
"github.com/google/blueprint"
- "github.com/google/blueprint/depset"
"github.com/google/blueprint/proptools"
- "github.com/google/blueprint/uniquelist"
)
// BuildParameters describes the set of potential parameters to build a Ninja rule.
@@ -555,8 +554,8 @@
return m.packageFile(fullInstallPath, srcPath, false)
}
-func (m *moduleContext) getAconfigPaths() Paths {
- return m.aconfigFilePaths
+func (m *moduleContext) getAconfigPaths() *Paths {
+ return &m.aconfigFilePaths
}
func (m *moduleContext) setAconfigPaths(paths Paths) {
@@ -571,12 +570,12 @@
srcPath: srcPath,
symlinkTarget: "",
executable: executable,
- effectiveLicenseFiles: uniquelist.Make(licenseFiles),
+ effectiveLicenseFiles: &licenseFiles,
partition: fullInstallPath.partition,
skipInstall: m.skipInstall(),
- aconfigPaths: uniquelist.Make(m.getAconfigPaths()),
+ aconfigPaths: m.getAconfigPaths(),
archType: m.target.Arch.ArchType,
- overrides: uniquelist.Make(overrides),
+ overrides: &overrides,
owner: m.ModuleName(),
}
m.packagingSpecs = append(m.packagingSpecs, spec)
@@ -704,9 +703,9 @@
executable: false,
partition: fullInstallPath.partition,
skipInstall: m.skipInstall(),
- aconfigPaths: uniquelist.Make(m.getAconfigPaths()),
+ aconfigPaths: m.getAconfigPaths(),
archType: m.target.Arch.ArchType,
- overrides: uniquelist.Make(overrides),
+ overrides: &overrides,
owner: m.ModuleName(),
})
@@ -751,9 +750,9 @@
executable: false,
partition: fullInstallPath.partition,
skipInstall: m.skipInstall(),
- aconfigPaths: uniquelist.Make(m.getAconfigPaths()),
+ aconfigPaths: m.getAconfigPaths(),
archType: m.target.Arch.ArchType,
- overrides: uniquelist.Make(overrides),
+ overrides: &overrides,
owner: m.ModuleName(),
})