From 862c0d68fff500d7fe59bc2fcfc9c7d75596e5b5 Mon Sep 17 00:00:00 2001 From: Jooyung Han Date: Wed, 21 Dec 2022 10:15:37 +0900 Subject: Check for duplicate bundled files from different modules. A single file generated by different modules is almost never correct; make it an error. The check is skipped for some error cases, which will be handled in follow-ups. Bug: 191770320 Test: m (soong test) Change-Id: Ib3c6efd16bdf13b59f79be66d4f9dba49100f6cc --- apex/bootclasspath_fragment_test.go | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) (limited to 'apex/bootclasspath_fragment_test.go') diff --git a/apex/bootclasspath_fragment_test.go b/apex/bootclasspath_fragment_test.go index b298dac5d..af4fd9f27 100644 --- a/apex/bootclasspath_fragment_test.go +++ b/apex/bootclasspath_fragment_test.go @@ -71,10 +71,6 @@ func TestBootclasspathFragments(t *testing.T) { name: "com.android.art", key: "com.android.art.key", bootclasspath_fragments: ["art-bootclasspath-fragment"], - java_libs: [ - "baz", - "quuz", - ], updatable: false, } @@ -301,11 +297,7 @@ func TestBootclasspathFragmentInArtApex(t *testing.T) { "mybootclasspathfragment", ], // bar (like foo) should be transitively included in this apex because it is part of the - // mybootclasspathfragment bootclasspath_fragment. However, it is kept here to ensure that the - // apex dedups the files correctly. - java_libs: [ - "bar", - ], + // mybootclasspathfragment bootclasspath_fragment. updatable: false, } @@ -445,7 +437,6 @@ func TestBootclasspathFragmentInArtApex(t *testing.T) { }) java.CheckModuleDependencies(t, result.TestContext, "com.android.art", "android_common_com.android.art_image", []string{ - `bar`, `com.android.art.key`, `mybootclasspathfragment`, }) @@ -559,7 +550,6 @@ func TestBootclasspathFragmentInArtApex(t *testing.T) { }) java.CheckModuleDependencies(t, result.TestContext, "com.android.art", "android_common_com.android.art_image", []string{ - `bar`, `com.android.art.key`, `mybootclasspathfragment`, `prebuilt_com.android.art`, @@ -1105,10 +1095,6 @@ func TestBootclasspathFragment_AndroidNonUpdatable(t *testing.T) { name: "com.android.art", key: "com.android.art.key", bootclasspath_fragments: ["art-bootclasspath-fragment"], - java_libs: [ - "baz", - "quuz", - ], updatable: false, } @@ -1270,10 +1256,6 @@ func TestBootclasspathFragment_AndroidNonUpdatable_AlwaysUsePrebuiltSdks(t *test name: "com.android.art", key: "com.android.art.key", bootclasspath_fragments: ["art-bootclasspath-fragment"], - java_libs: [ - "baz", - "quuz", - ], updatable: false, } -- cgit v1.2.3-59-g8ed1b