From a51c4ce10e959137f2a3a26442438b5a1200ca64 Mon Sep 17 00:00:00 2001 From: Jiyong Park Date: Tue, 30 Apr 2024 18:09:09 +0900 Subject: Prevent multiple PackagingSpecs having same installation path This fixes a bug that different PackagingSpecs having the same installation path were silently allowed. Previously, a PackagingSpec that comes the first for the given installation path won, effectively eclipsing other PackagingSpecs destined for the same installation path. Bug: 335506668 Test: go test ./... Change-Id: Ia36f656e8364f95c4be78fff6e9dc16966307526 --- filesystem/filesystem_test.go | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'filesystem/filesystem_test.go') diff --git a/filesystem/filesystem_test.go b/filesystem/filesystem_test.go index 121504867..acd481352 100644 --- a/filesystem/filesystem_test.go +++ b/filesystem/filesystem_test.go @@ -442,3 +442,26 @@ 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", + } + `) +} -- cgit v1.2.3-59-g8ed1b