Merge changes from topic "revert-3066748-duplicate_entry_fs-CIBDJQYRHU" into main am: 0141b4acad am: 1ea4100cb5

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3069323

Change-Id: I283bdae9fac1fd0e90fdcc01281973e2157cf623
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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