From 31e444e101909ab48bd3ca71eb1d9c79519a3ebb Mon Sep 17 00:00:00 2001 From: Ulya Trafimovich Date: Fri, 14 Aug 2020 17:32:16 +0100 Subject: Collect paths to transitive SDK Java library dependencies. Previously only the names were collected, and later used in the manifest_fixer to add missing entries to the manifest. Now we also need to collect build-time and on-device paths, to be used in class loader context for dexpreopt. This commit only collects paths, but does not pass them to dexpreopt yet. Test: lunch aosp_cf_x86_phone-userdebug && m Bug: 132357300 Change-Id: I34b229ee68f16ba215ba03770feadb4d890ec2bf --- java/java_test.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'java/java_test.go') diff --git a/java/java_test.go b/java/java_test.go index 50c40c38c..0089545ca 100644 --- a/java/java_test.go +++ b/java/java_test.go @@ -20,7 +20,6 @@ import ( "path/filepath" "reflect" "regexp" - "sort" "strconv" "strings" "testing" @@ -1496,8 +1495,7 @@ func TestJavaSdkLibrary(t *testing.T) { // test if baz has exported SDK lib names foo and bar to qux qux := ctx.ModuleForTests("qux", "android_common") if quxLib, ok := qux.Module().(*Library); ok { - sdkLibs := quxLib.ExportedSdkLibs() - sort.Strings(sdkLibs) + sdkLibs := quxLib.ExportedSdkLibs().Names() if w := []string{"bar", "foo", "fred", "quuz"}; !reflect.DeepEqual(w, sdkLibs) { t.Errorf("qux should export %q but exports %q", w, sdkLibs) } -- cgit v1.2.3-59-g8ed1b