diff options
author | Jiyong Park <jiyong@google.com> | 2024-05-01 05:25:41 +0000 |
---|---|---|
committer | Jiyong Park <jiyong@google.com> | 2024-05-01 05:25:41 +0000 |
commit | 3d65d9cb901a73e63398d31352f3e422d7a68b90 (patch) | |
tree | 0e1fbeaf73c34465c0dc29f9fc282280b3ec597f | |
parent | 54351867fa0dff593eb61d111d1d7ffb7d3d02f2 (diff) | |
download | soong-3d65d9cb901a73e63398d31352f3e422d7a68b90.tar.gz |
Revert "Prevent multiple PackagingSpecs having same installation..."
Revert submission 3066748-duplicate_entry_fs
Reason for revert: b/338159248
Reverted changes: /q/submissionid:3066748-duplicate_entry_fs
Change-Id: I89906e160f62f1bf84eb65a1b99940f139626786
-rw-r--r-- | android/packaging.go | 29 | ||||
-rw-r--r-- | filesystem/filesystem_test.go | 23 |
2 files changed, 2 insertions, 50 deletions
diff --git a/android/packaging.go b/android/packaging.go index fe61da1e9..66772183c 100644 --- a/android/packaging.go +++ b/android/packaging.go @@ -50,25 +50,6 @@ type PackagingSpec struct { skipInstall bool } -func (p *PackagingSpec) Equals(other *PackagingSpec) bool { - if other == nil { - return false - } - if p.relPathInPackage != other.relPathInPackage { - return false - } - if p.srcPath != other.srcPath || p.symlinkTarget != other.symlinkTarget { - return false - } - if p.executable != other.executable { - return false - } - if p.partition != other.partition { - return false - } - return true -} - // Get file name of installed package func (p *PackagingSpec) FileName() string { if p.relPathInPackage != "" { @@ -262,15 +243,9 @@ func (p *PackagingBase) GatherPackagingSpecsWithFilter(ctx ModuleContext, filter continue } } - dstPath := ps.relPathInPackage - if existingPs, ok := m[dstPath]; ok { - if !existingPs.Equals(&ps) { - ctx.ModuleErrorf("packaging conflict at %v:\n%v\n%v", dstPath, existingPs, ps) - } - continue + if _, ok := m[ps.relPathInPackage]; !ok { + m[ps.relPathInPackage] = ps } - - m[dstPath] = ps } }) return m diff --git a/filesystem/filesystem_test.go b/filesystem/filesystem_test.go index acd481352..121504867 100644 --- a/filesystem/filesystem_test.go +++ b/filesystem/filesystem_test.go @@ -442,26 +442,3 @@ func TestInconsistentPartitionTypesInDefaults(t *testing.T) { } `) } - -func TestPreventDuplicatedEntries(t *testing.T) { - fixture.ExtendWithErrorHandler(android.FixtureExpectsOneErrorPattern( - "packaging conflict at")). - RunTestWithBp(t, ` - android_filesystem { - name: "fs", - deps: [ - "foo", - "foo_dup", - ], - } - - cc_binary { - name: "foo", - } - - cc_binary { - name: "foo_dup", - stem: "foo", - } - `) -} |